Re-commit r218259.