This reverts commit 2246700e. Seeing buildbot failures; it looks like I rebased over a new test which is effected by the change.