Reapply r79555 for testing. Daniel's trying to work out some buildbot weirdnesss.