Fixed code that was broke because of previous refactorings.
Authored by: skull5 2010-08-03
Parent: [r12214]
Child: [r12216]