Bug 1090175 - Backport upstream bug 1083258 (fix single value select elements)
r=dkl