Revert change from merge that broke build
Authored by: b_calderwood 2012-09-18
Parent: [r6359]
Child: [r6361]