Revert "Merge pull request #13 from stanhu/master", since some tests are failing

This reverts commit 006a7d0463577794397789a0ea3ae1ce5dd5310c, reversing
changes made to 22a43c12047345c8724f803e4cc56a46af34846e.