Revert "Merge pull request #607 from walling/master"

This reverts commit 1aea2e02c1a8d641bc7f7c6e58d7faaf13cb1696, reversing
changes made to db3d1de5f8ab587fcbad6813edfb7ce52d21ad96.