Revert commit 581bbff

Causes problems? Just go back until more info. Fixes #103 and #104