Revert "Merge pull request #33 from schacon/chacon-rulez"

This reverts commit ac4cf244c790d0095d3e1a8915725021be076958, reversing
changes made to 31fffd18b2ba6820b2189771938e3b94a8b93d58.