This reverts commit 7545ba6f. It breaks eHEA among other issues
Attach a file by drag & drop or click to upload
