This reverts commit 50c3fae8. Let's postpone that after 2.2.x
Attach a file by drag & drop or click to upload
