Improve handling of '*' for joined tables
Revert "Improve handling of '*' for joined tables"

This reverts commit fe28bc42158b13fe4547c9e4d0c43cad5d4a8cca.