Revert "Merge pull request #176 from LegNeato/master"

Reverting commit that broke tests!