I think we should revert this specific change, we should always try to have this hook.

is it ok for you if I revert this in https://github.com/mozilla-b2g/gaia/pull/12248 ?