This reverts commit aec3daa8. This is an incomplete fix, and did not quality for a backport.
Attach a file by drag & drop or click to upload
