Simplified. Back to 1.7s emacs-init-time.