This makes TestAdHocQueries pass on my desktop.  I don't know why, and
I no longer care, I just need closure.