Fixing a breaking change for the Account APIs.