diff --git a/lib/IRGen/StructLayout.cpp b/lib/IRGen/StructLayout.cpp
index eeb8096bf9662..eb2230fb022c9 100644
--- a/lib/IRGen/StructLayout.cpp
+++ b/lib/IRGen/StructLayout.cpp
@@ -446,7 +446,7 @@ unsigned irgen::getNumFields(const NominalTypeDecl *target) {
   if (auto cls = dyn_cast<ClassDecl>(target)) {
     if (cls->isRootDefaultActor()) {
       numFields++;
-    } else if (cls->isRootDefaultActor()) {
+    } else if (cls->isNonDefaultExplicitDistributedActor()) {
       numFields++;
     }
   }
diff --git a/test/Distributed/Runtime/distributed_actor_assume_executor.swift b/test/Distributed/Runtime/distributed_actor_assume_executor.swift
index 961857e9e2f46..66d725474554b 100644
--- a/test/Distributed/Runtime/distributed_actor_assume_executor.swift
+++ b/test/Distributed/Runtime/distributed_actor_assume_executor.swift
@@ -14,9 +14,6 @@
 // UNSUPPORTED: use_os_stdlib
 // UNSUPPORTED: freestanding
 
-// rdar://106822386
-// REQUIRES: rdar106822386
-
 import StdlibUnittest
 import Distributed
 import FakeDistributedActorSystems