42dcf914d1 and 4d4c32504a were cherry-picked in the wrong order and merged wrong. The wrapper is not necessary due to wrapGAppsHook.
42dcf914d1
4d4c32504a