Revert r195176, it is breaking buildbots for unclear reason