Revert "Merge pull request #232 from shrug/maint/qe-465"

This reverts commit afc957cf748f23d7fdd0564312a699dd7175c04b, reversing
changes made to 50e80b26da3bc704a9c785f1c3f225d789d4d021.
Merge pull request #241 from shrug/master

(maint) Revert "Merge pull request #232 from shrug/maint/qe-465"