Switched over completely to the hook system.
Removed unecessary (and incorrect) comment.