Revert "Merge pull request #843 from rtfd/merge-1.6"

This reverts commit c9602934fcb7311c27c516d1b1024df6023c69e8, reversing
changes made to e67465175d981d19bdd98e911d02c85e7009edff.