This reverts commit fe6f6cd6. Found test failure on several buildbots.
mentioned in commit ffeb64db
mentioned in commit 61b35e41
mentioned in commit 9bda7ab8