Revert rev. 54198, it's not really backwards compatible.
3 files changed