Revert commit e03d13e9, to be replaced by a much nicer fix from Roland.
Attach a file by drag & drop or click to upload
