Revert "Merge pull request #1710 from jvantuyl/master"

This reverts commit a8300c0ae6dd7e6b1655cf80b349e0bf645ff694, reversing
changes made to 2e196be143035fa6d03743d6ca95a2904572f12a.