back out my recent commit (r80858), it seems to break self-hosting buildbot's stage...