apa
Put enough into the new query planner so that all tests pass again