Revert "Merge pull request #410 from treppo/master"

This reverts commit 6e344fef4e00914d3a2e8955f48cf5ca7479a945, reversing
changes made to 4c88ca6e45dfb9b2bd80f1ff3eebd84e7b5d885d.