This reverts commit d3c22487 partially and fixes the bug in a much simpler way.
Attach a file by drag & drop or click to upload
