backported fix for controllerless usage