Another attempt at stopping perpetual restarts