Revert "Merge pull request #1 from agt-the-walker/master"

This reverts commit 56238bcf0ffd06e1cab27051f3da0bf7208c45a2, reversing
changes made to 7011f282226a693cc522cc9fa6ed1d8b64640b76.