Revert "Merge pull request #236 from phoglund/master"

This reverts commit 2b6353ff8a8ef51c218cf0949899348119fdb0c1, reversing
changes made to 037e5688c8dc46c35f68abf201ae0983e2ae5f6d.