Revert changeset 1f31bf3f76f5 (issue5322) except tests.
3 files changed