Fix restart state loop

Using the special state maker for itself which causes loops on timeout on timeout.