Revert r110396 to fix buildbots.