This reverts commit b82a7be6. There is a better (less invasive) way to fix it, which I will commit next.
Attach a file by drag & drop or click to upload
