followup r88898 -- move BeforeInitialize hook to where it can be