Make hooks re-usable (they will back themselves up) for 4.2