Fixes #12423 - Additional select columns are removed when using includes

> The distinct takes care of any duplicates.

Err, no it doesn't.

And actually, isn't `except(:select).select([foo] + [select_values])` equivalent to a plain `select(foo)`? (That is, aren't we doing the `except` here specifically to avoid the existing `select_values`?)