Issue #2234319 by DamienMcKenna, Alan D., Dane Powell: Remove hook_init() code to improve performance