Revert "Fixes #43"

This reverts commit 828c55b603c33e9e7e3edd4ebb2af107220f9468.

Should be done in "develop". Sorry.