Revert "Merge pull request #377 from lizardlab/master"

This reverts commit df9a408e, reversing
changes made to ca36f293.