blarg
More backporting
Remove logging
move a query