This reverts c9d920f3 so that we can attempt to fix the build. The build dashboard clearly shows that things started failing at this change, although it's not totally clear that it is the cause: tests succeed locally.

If it doesn't fix things we can re-land this.