Fix mike's mess. Name class var correctly, and unshift rather than shift.
Fix mike's mess. Name class var correctly, and unshift rather than shift.


svn commit r18251

silverorange/swat,silverorange/swat