Revert commit 131534 since it seems to have broken several buildbots.