This reverts commit 88cf37d2 as well as follow-on commits ea9c4a16 and c5756272. We've learned about as much as we can from the buildfarm.