Revert simplification to make tests pass

Author: owen-mc

go/ql/lib/semmle/go/dataflow/internal/FlowSummaryImpl.qll

@@ -306,7 +306,23 @@ module SourceSinkInterpretationInput implements
         or
         // `syntacticQualBaseType`'s underlying type might be a struct type and `sse`
         // might refer to an embedded method or field.
-        syntacticQualBaseType.getUnderlyingType().(StructType).hasEmbeddedField(targetType, _)
+        exists(StructType st, Field field1, Field field2, int depth1, int depth2, Type t2 |
+          st = syntacticQualBaseType.getUnderlyingType() and
+          field1 = st.getFieldAtDepth(_, depth1) and
+          field2 = st.getFieldAtDepth(_, depth2) and
+          targetType = lookThroughPointerType(field1.getType()) and
+          t2 = lookThroughPointerType(field2.getType()) and
+          (
+            field1 = field2
+            or
+            field2 =
+              targetType.getUnderlyingType().(StructType).getFieldAtDepth(_, depth2 - depth1 - 1)
+          )
+        |
+          sse.asEntity().(Method).getReceiverBaseType() = t2
+          or
+          sse.asEntity().(Field).getDeclaringType() = t2.getUnderlyingType()
+        )
       )
     )
   }