Revert "Fixes #16"

This reverts commit b41b5ec2549d811ded3fc3e390fc6fb12311c530.