Revert "fixes #821"

This reverts commit 768d67d50920b3a41da5d55b442c7c816f5fc34c.