I believe this change could have some unintended consequences. Query.setup_joins() has an allow_explicit_fk parameter, and this change will likely break that code. (I haven't tested this, but seems likely...)