Restoring back to not using shared keychain by default