Avoid restart loop with magic restart pref
Don't require a sharedLock (again)