Merge 2271-revert.