Switch to the new (broken) method of composing queries