KCINFR-979: autowire generators

Oh the comment needs to be moved but yes it is necessary until I remove the s2s code