This reverts commit 159a6f1e. This is finally not needed by a future patch, and it's less obvious.
Attach a file by drag & drop or click to upload
