Revert "Fixes #15"

This reverts commit 548996b55e00760f8ad2ce016df54075ae1b2ad2.