Revert "Sigh"

This reverts commit a706a05.

src/coreclr/tools/Common/TypeSystem/Canon/TypeSystemContext.Canon.cs

@@ -92,7 +92,6 @@ protected internal virtual TypeDesc ConvertToCanon(TypeDesc typeToConvert, Canon
             throw new NotSupportedException();
         }
 
-        internal partial void InternalGetSupportsUniversalCanon(ref bool flag) => flag = SupportsUniversalCanon;
         public abstract bool SupportsCanon { get; }
         public abstract bool SupportsUniversalCanon { get; }
 

src/coreclr/tools/Common/TypeSystem/Common/MetadataFieldLayoutAlgorithm.cs

@@ -169,16 +169,13 @@ out instanceByteSizeAndAlignment
 
         protected virtual ComputedInstanceFieldLayout ComputeInstanceFieldLayout(MetadataType type, int numInstanceFields)
         {
-            bool supportsUniversalCanon = false;
-            type.Context.InternalGetSupportsUniversalCanon(ref supportsUniversalCanon);
-
             if (type.IsExplicitLayout)
             {
                 return ComputeExplicitFieldLayout(type, numInstanceFields);
             }
             // Sequential layout has to be respected for blittable types only. We use approximation and respect it for
             // all types without GC references (ie C# unmanaged types). Universal canonical instances might be blittable.
-            else if (type.IsSequentialLayout && (supportsUniversalCanon || !type.ContainsGCPointers))
+            else if (type.IsSequentialLayout && (type.Context.SupportsUniversalCanon || !type.ContainsGCPointers))
             {
                 return ComputeSequentialFieldLayout(type, numInstanceFields);
             }

src/coreclr/tools/Common/TypeSystem/Common/TypeSystemContext.cs

@@ -813,7 +813,5 @@ internal TypeFlags ComputeTypeFlags(TypeDesc type, TypeFlags flags, TypeFlags ma
         /// Determine if the type implements <code>IDynamicInterfaceCastable</code>
         /// </summary>
         protected internal abstract bool IsIDynamicInterfaceCastableInterface(DefType type);
-
-        internal partial void InternalGetSupportsUniversalCanon(ref bool flag);
     }
 }