Reverted change made to SelectTag since it resulted in a NPE.
Authored by: keess 2015-04-13
Parent: [r2716]
Child: [r2718]
