Revert "Merge pull request #1012 from lukecampbell/qc"

This reverts commit 50e194082256f46c64da2abcb0c7211a7325783c, reversing
changes made to ef7837cd843a6c036ae82382ddf3521b4eb691e7.