Restore old keychain code when building against 10.7