This reverts commit 9eb80ab3. This is causing failures on multiple builders. Pulling it out until I have time to fix it.