Revert "Merge pull request #432 from glamrock/master"

This reverts commit 0d6e88841dffcad95cf7b5c111c25422c7dc2b27, reversing
changes made to 09ce2a9f29624dedd3165333d92c4c3dcb0a867a.