This reverts commit 394a9e2c. This doesn't really fix the issues, so better to revert and rework it.
Attach a file by drag & drop or click to upload
