rolled back previous customizations. functions should be as original now.
Authored by: rainbowblack 2012-07-12
Parent: [r8]
Child: [r10]
