diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/entities/UserCapabilities.java b/service/src/main/java/org/whispersystems/textsecuregcm/entities/UserCapabilities.java
index e1ef5b22a..2f46108cc 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/entities/UserCapabilities.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/entities/UserCapabilities.java
@@ -7,16 +7,9 @@ package org.whispersystems.textsecuregcm.entities;
 
 import org.whispersystems.textsecuregcm.storage.Account;
 
-public record UserCapabilities(
-    boolean paymentActivation,
-    boolean pni) {
+public record UserCapabilities(boolean paymentActivation, boolean pni) {
 
-  public static UserCapabilities createForAccount(Account account) {
-    return new UserCapabilities(
-        account.isPaymentActivationSupported(),
-
-        // Although originally intended to indicate that clients support phone number identifiers, the scope of this
-        // flag has expanded to cover phone number privacy in general
-        account.isPniSupported());
+  public static UserCapabilities createForAccount(final Account account) {
+    return new UserCapabilities(account.isPaymentActivationSupported(), true);
   }
 }