Being consistent with the previous behavior for scheduling key generation