Reverted commit 9795d68
Merge pull request #182 from WouterJ/revert_181

Reverted commit 9795d68