Revert Pull Request #1771, see issue #1785 (#1786)