Bug 1018342 - Stop restore/throttle flapping

Bug 1018342 - Stop restore/throttle flapping