This reverts commit fcef1617, about which both the buildfarm and my local machine are very unhappy.
Attach a file by drag & drop or click to upload
