Revert r256952 due to lit test fails.