This reverts commit 25eb7fa0. Previous buildbot failures appear to have been a fluke from a dirty build.