Reverting some changes from 9e410214dd073db73ea1cc007ffa59b919e99ba0 (Sorry, @SticklyMan). Also made a minor change to hook.lua IAW Garry's changes.