So, you just moved things around so that the demote code isn't called for raw queries. /me checks PR description to validate my assumption.

YAY! I was right :+1: 

r+