Re-commit r83327 now that the release is done.
4 files changed