Revert "Merge pull request #487 from untidy-hair/fix_rakefile"

This reverts commit 2d04a77a0e64fab194d2645ee1deb44881ef3cfe, reversing
changes made to eb229091d11ae4a4b9d30a7e9b98f30b7bdd5fc7.