Reverting change to QueryExtractor

The issue appears to have already been addressed by be4f2ed9e