Revert "Fixes #203"

This reverts commit 97f9143d18a06bde03544ac1b6c6a77033960dce.
After discussion, user feedback is always welcome, see issue