Reverting r93751 per r93751 CR.