This fixes and re-lands 4bb7496b, which was reverted in ceade39c due to test failures caused by a bad rebase.
Attach a file by drag & drop or click to upload
