Start on #5035, still needs support for init.sls