Revert "Fixes #132"

This reverts commit 642be671292ee8ba1149795472cf3f7a14b80cc4.