Don't use after-init-hook to work around possible customization issue