Revert "Fix 654"
Merge pull request #2 from kyeweedon/revert-1-hotfix/654

Revert "Fix 654"