Revert "fixes #2044"

This reverts commit c358de020b5c8bd8772cf67e432d475f62a47919.