Rolled back the force select part as it is not backwards compatible.
Authored by: keess 2015-06-09
Parent: [r2756]
Child: [r2758]
