Revert r237579, as it broke windows buildbots