remove join condition mangling

it's a complicated monkeypatch. easier to just make our code compatible

Change-Id: I2ea89cc7aa5b77a0613f5aca4c1c9f20bf7b8486
Reviewed-on: https://gerrit.instructure.com/41709
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Nick Cloward <ncloward@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>