Revert r97531 -- hook call added that uses undefined local variables, will spew E_NOT...