Explicit revert to @583052a20e [join] query

Revert to @583052a20e080e9a3211c85f7a6befd6bfeb9626, it should be tested properly and include in next version.