Revert "Merge pull request #734 from jonathantneal/issue733"

This reverts commit 54afcdda0a388d88cbc4defb2614192936548c52, reversing
changes made to 6f617bfd4c51d24139a4124c42b51c02f9f14ceb.