Revert "Merge pull request #1117 from erikvold/893189v2"

This reverts commit 7e2beb888a06139a80d98bceda70edd3706635e0, reversing
changes made to 612c2a9ba7e8fde42885938abc7ad3baddfd93f1.