Revert "Fixes #8"

This reverts commit b4b7d958d03421f3c680dcc6b5ba5f5e8faee04c.