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

Doesn't this mean we select all the columns of the parent twice? And that doesn't even consider the possibility that `select_values` contains a bare `*`, as it often does... :confused: