moved to use the query_runner.annotate_query flag so we won't get the SQL comment