Broke buildbots since I hadn't updated this patch in a while. Sorry for the noise. This reverts commit 49e5f603.