Revert commit r157966