Revert commit 158979 (dyatkovskiy) since it is causing several buildbots to