Reverting r252760