Revert accidentally commited changes (Issue #1653)