back out some query changes