diff --git a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionSystemInfo.java b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionSystemInfo.java
index ea4283378d..03b60cfc16 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionSystemInfo.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionSystemInfo.java
@@ -34,6 +34,7 @@ import org.thoughtcrime.securesms.util.ServiceUtil;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.VersionTracker;
+import org.thoughtcrime.securesms.window.WindowSizeClass;
 import org.whispersystems.signalservice.api.push.ServiceId.ACI;
 
 import java.util.Arrays;
@@ -61,6 +62,7 @@ public class LogSectionSystemInfo implements LogSection {
     builder.append("Screen            : ").append(getScreenResolution(context)).append(", ")
                                       .append(ScreenDensity.get(context)).append(", ")
                                       .append(getScreenRefreshRate(context)).append("\n");
+    builder.append("WindowSizeClass   : ").append(WindowSizeClass.Companion.getWindowSizeClass(context.getResources())).append("\n");
     builder.append("Font Scale        : ").append(context.getResources().getConfiguration().fontScale).append("\n");
     builder.append("Animation Scale   : ").append(ContextUtil.getAnimationScale(context)).append("\n");
     builder.append("Android           : ").append(Build.VERSION.RELEASE).append(", API ")
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/RemoteConfig.kt b/app/src/main/java/org/thoughtcrime/securesms/util/RemoteConfig.kt
index ae657a7d70..4c044908dc 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/RemoteConfig.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/RemoteConfig.kt
@@ -575,12 +575,13 @@ object RemoteConfig {
   /** Whether or not the user is an 'internal' one, which activates certain developer tools. */
   @JvmStatic
   @get:JvmName("internalUser")
-  val internalUser: Boolean by remoteValue(
-    key = "android.internalUser",
-    hotSwappable = true
-  ) { value ->
-    value.asBoolean(false) || Environment.IS_NIGHTLY || Environment.IS_STAGING
-  }
+  val internalUser: Boolean = true
+//  val internalUser: Boolean by remoteValue(
+//    key = "android.internalUser",
+//    hotSwappable = true
+//  ) { value ->
+//    value.asBoolean(false) || Environment.IS_NIGHTLY || Environment.IS_STAGING
+//  }
 
   /** The raw client expiration JSON string.  */
   @JvmStatic
@@ -1131,11 +1132,11 @@ object RemoteConfig {
   )
 
   /** Whether to allow different WindowSizeClasses to be used to determine screen layout */
-  val largeScreenUi: Boolean by remoteBoolean(
+  val largeScreenUi: Boolean = true /*by remoteBoolean(
     key = "android.largeScreenUI",
     hotSwappable = false,
     defaultValue = false
-  )
+  )*/
 
   @JvmStatic
   @get:JvmName("useMessageSendRestFallback")