diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/util/ModelRepresentationConversions.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/util/ModelRepresentationConversions.java
index 33bda508a..08c5431e2 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/util/ModelRepresentationConversions.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/util/ModelRepresentationConversions.java
@@ -96,9 +96,6 @@ public static Map<String, Object> getRelyingPartyOverridesRepresentationFromAttr
             }
         }
 
-        // TODO: fix this; currently there is a problem with not returning a value
-        completeMe(relyingPartyOverrides);
-
         return relyingPartyOverrides;
     }
 
diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/domain/filters/PolymorphicFiltersJacksonHandlingTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/domain/filters/PolymorphicFiltersJacksonHandlingTests.groovy
index 8c6707e26..fd5efd876 100644
--- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/domain/filters/PolymorphicFiltersJacksonHandlingTests.groovy
+++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/domain/filters/PolymorphicFiltersJacksonHandlingTests.groovy
@@ -69,7 +69,6 @@ class PolymorphicFiltersJacksonHandlingTests extends Specification {
         roundTripFilter instanceof EntityRoleWhiteListFilter
     }
 
-    @Ignore("until we handle the workaround for SHIBUI-1237")
     def "Correct polymorphic serialization of EntityAttributesFilter"() {
         given:
         def simulatedPersistentFilter = testObjectGenerator.entityAttributesFilter()