Revert "Properly fixes #123"

This reverts commit 883d726f5bb8cbcf6e9e78ad1a395a56558eadac.
Revert "Fixes #123"

This reverts commit 5a87dbcd4768a613dfb2cf3678123a3fcdfd40da.