Revert "Fixes #8"

This reverts commit 7b47f02c8c03bbf61f0b91897203ba6496a0765a.