Revert "fixes #1691"

This reverts commit 8766faa3ddc9e8cf4c513eec4496dafad6c32033.