As dicussed during bugwash. Ref #2489 partially reverts 9701bc56
Attach a file by drag & drop or click to upload