Revert "Fixes #1"

This reverts commit 1f5e782deb9a8bd4a1abef16cbd43a7d05eed25b.