Speculatively revert r108813, in an attempt to get the self-host buildbots working...