This reverts commit 43842b88 while I investigate a buildbot failure. It also reverts the follow-up commit 2883de05.