This reverts commit ad74d505. Turns out it's not a good fix -- Travis has just crashed on this test.
Attach a file by drag & drop or click to upload
