Revert r80580 due to some unintended side effects. See issue #8202 for details.
3 files changed