Revert r58635 and related, unnecessary and incorrect use of the hook mechanism