Rolled back hof fix until the rest of my additions are ready.
Authored by: orochi_x 2010-10-20
Parent: [r2914]
Child: [r2916]
