Revert "Don't remove the select values to add they back again"

This reverts commit 0785008a64f4af8d09379683303d49d160cd444d.

Reason: MySQL tests are broken with this change because STI information
seems to be lost. We will apply a fix only on master for this.