Revert "Merge pull request #22 from sheh/master"

This reverts commit 090f209083798813b57b56743f44bef6d7d9bdf2, reversing
changes made to 794fe750f9d673334a7975aceb15f574feac1284.