Revert r37857, r37861