This reverts only one hunk of the original commit, as this part causes a regression not trivial to fix.
Attach a file by drag & drop or click to upload
