This reverts commit 51630d59. Monty has more comprehensive fix coming in his branch.
Attach a file by drag & drop or click to upload
