This reverts commit 49185457c91358d52e4fcf74c7481d1fda77f122. It was a temporary fix to unbreak some of the builders.