Revert "Fixes #61"

This reverts commit f44bb2fc93df6e3b7707cb6d275df1bf16c02e1d.