Revert "Merge branch 'master' of https://github.com/Lirick/Hitchhiker"

This reverts commit 816be51a7dbe107355042f2a33d411450d140fc2, reversing
changes made to 64a6d31e83aee660819e0202ef0025556c86e719.