This reverts commit fcef161729, about which both the buildfarm and my local machine are very unhappy.
fcef161729