Fix on demand being disabled for restart methods