I have a patch the will move this to `init`, just a heads up (it'll be on me to resolve when the time comes)