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

This sounds needlessly inefficient, in a hotspot.