PrivacyGuard: fix merge breakage