revert r93284 and follow up r93285