Revert "fixes #1648"

This reverts commit a11bcf4dbd4faf79d403c97a3bfc73575eb94aa0.