This reverts commit 9fb33d52. Buildbots are showing a number of regressions that don't reproduce locally. Needs more investigating.