Revert "fix" for parsing JOIN as it broke stuff.