This reverts commit ffe14c90 and hopefully resolves OF-1263 and OF-1269
Attach a file by drag & drop or click to upload
