This reverts commit 5a0a7da8. This caused failres on the build performance tests on the autobuilder.
mentioned in commit 1506737e