Rolling back change to this version to fix labels issue
Authored by: rkisson 2012-02-07
Parent: [r6051]
Child: [r6053]