Re-commit r220667.