diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index 65da33c99b..5c97e2220d 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -2980,29 +2980,8 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
                                                           context->Config);
         return propContent ? propContent : "";
       }
-      // FIXME: This duplicates the COMPATIBLE_INTERFACE_NUMBER_{MAX,MIN}
-      // evaluation below because it is not reached when evaluating outside of
-      // usage requirements, such as in add_custom_target, because there is no
-      // dagCheckerParent.
-      if (target->IsLinkInterfaceDependentNumberMinProperty(propertyName,
-                                                            context->Config)) {
-        context->HadContextSensitiveCondition = true;
-        const char* propContent =
-          target->GetLinkInterfaceDependentNumberMinProperty(propertyName,
-                                                             context->Config);
-        return propContent ? propContent : "";
-      }
-      if (target->IsLinkInterfaceDependentNumberMaxProperty(propertyName,
-                                                            context->Config)) {
-        context->HadContextSensitiveCondition = true;
-        const char* propContent =
-          target->GetLinkInterfaceDependentNumberMaxProperty(propertyName,
-                                                             context->Config);
-        return propContent ? propContent : "";
-      }
     }
-    if (!target->IsImported() && dagCheckerParent &&
-        !dagCheckerParent->EvaluatingLinkLibraries()) {
+    if (!evaluatingLinkLibraries && !target->IsImported()) {
       if (target->IsLinkInterfaceDependentNumberMinProperty(propertyName,
                                                             context->Config)) {
         context->HadContextSensitiveCondition = true;
diff --git a/Tests/CompatibleInterface/CMakeLists.txt b/Tests/CompatibleInterface/CMakeLists.txt
index 4927329f25..5d57ce420b 100644
--- a/Tests/CompatibleInterface/CMakeLists.txt
+++ b/Tests/CompatibleInterface/CMakeLists.txt
@@ -228,9 +228,8 @@ add_custom_target(check ALL VERBATIM
 
     "ON"       "$<TARGET_PROPERTY:static1,BOOL_PROP5>"
     "prop4"    "$<TARGET_PROPERTY:static1,STRING_PROP4>"
-    #FIXME: These two cases do not work correctly.
-    #"6"        "$<TARGET_PROPERTY:static1,NUMBER_MIN_PROP6>"
-    #"4"        "$<TARGET_PROPERTY:static1,NUMBER_MAX_PROP4>"
+    "6"        "$<TARGET_PROPERTY:static1,NUMBER_MIN_PROP6>"
+    "4"        "$<TARGET_PROPERTY:static1,NUMBER_MAX_PROP4>"
 
     "ON"       "$<TARGET_PROPERTY:object1,BOOL_PROP5>"
     "prop4"    "$<TARGET_PROPERTY:object1,STRING_PROP4>"