Refactor back to using use-package