partial revert of 9929cc94 Until we find a better solution. As discussed on ML.
Attach a file by drag & drop or click to upload
