Bug 5061 - introduce peer restarting