Well I'll be damned. I never considered that using `includes` and `joins` would *NOT* have any adverse effects. If this fixes the issue, as @daddeo2 confirmed over in #3673, then I say we merge it.