Reverted r21350, r21359, and r21360 as these were causing the GUI spectra lists to fail.
svn merge -r21350:r21349 . svn merge -r21360:r21358 .
Authored by: bugman 2013-10-31
Parent: [r21362]
Child: [r21364]