Revert "Fixes #15"

This reverts commit e82249ae3677edd126a0a5a4cd438651ad5baa42.
A ridiculous hack to actually fix #15 without messing other things up