This reverts commit b7b170c9 to give the author more time to address failing tests on the expensive checks buildbots.