This reverts commit 4d79ef81, which broke a few build bots. I'm reverting until I have time to investigate.