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