Given how the query is processed in 6, this should no longer be an issue. And kicking this issue "down the road" at every release is not beneficial to anyone. So closing it.