Bug 1101499: Adjusting logic of restoring gears state