Revert "Fixes #36"

This reverts commit b5bf3b7b616f4efba4873bf3fcfe79ce9aa9d155.