diff --git a/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/AvaloniaXamlIlLanguage.cs b/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/AvaloniaXamlIlLanguage.cs
index d5cc93ef66..581dbcdac7 100644
--- a/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/AvaloniaXamlIlLanguage.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/AvaloniaXamlIlLanguage.cs
@@ -165,7 +165,7 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
                     throw new XamlIlLoadException("Unable to find the parent scope for AvaloniaProperty lookup", node);
                 if (!(node is XamlIlAstTextNode text))
                     throw new XamlIlLoadException("Property should be a text node", node);
-                result = XamlIlAvaloniaPropertyHelper.CreateNode(context, text.Text, scope.TargetType, text, false);
+                result = XamlIlAvaloniaPropertyHelper.CreateNode(context, text.Text, scope.TargetType, text);
                 return true;
             }
 
diff --git a/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/Transformers/AvaloniaXamlIlSetterTransformer.cs b/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/Transformers/AvaloniaXamlIlSetterTransformer.cs
index d548d3a188..629e2562d3 100644
--- a/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/Transformers/AvaloniaXamlIlSetterTransformer.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/Transformers/AvaloniaXamlIlSetterTransformer.cs
@@ -16,24 +16,10 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
             if (!(node is XamlIlAstObjectNode on
                   && on.Type.GetClrType().FullName == "Avalonia.Styling.Setter"))
                 return node;
-            
-            // This is a hack required to get complex animations (which are also a hack) to work
-            var inAnimation = false;
-
-            XamlIlAstObjectNode parent = null;
-
-            foreach (var p in context.ParentNodes().OfType<XamlIlAstObjectNode>())
-            {
-                if (p.Type.GetClrType().FullName == "Avalonia.Styling.Style")
-                {
-                    parent = p;
-                    break;
-                }
-
-                if (p.Type.GetClrType().FullName == "Avalonia.Animation.Animation")
-                    inAnimation = true;
-            }
 
+            var parent = context.ParentNodes().OfType<XamlIlAstObjectNode>()
+                .FirstOrDefault(p => p.Type.GetClrType().FullName == "Avalonia.Styling.Style");
+            
             if (parent == null)
                 throw new XamlIlParseException(
                     "Avalonia.Styling.Setter is only valid inside Avalonia.Styling.Style", node);
@@ -59,9 +45,7 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
 
 
             var avaloniaPropertyNode = XamlIlAvaloniaPropertyHelper.CreateNode(context, propertyName,
-                new XamlIlAstClrTypeReference(selector, selector.TargetType, false), property.Values[0],
-                // Hack to allow passing any property to an animation 
-                inAnimation);
+                new XamlIlAstClrTypeReference(selector, selector.TargetType, false), property.Values[0]);
             property.Values = new List<IXamlIlAstValueNode>
             {
                 avaloniaPropertyNode
diff --git a/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/XamlIlAvaloniaPropertyHelper.cs b/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/XamlIlAvaloniaPropertyHelper.cs
index bf3f8958b3..6fc83cb5a5 100644
--- a/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/XamlIlAvaloniaPropertyHelper.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/XamlIlAvaloniaPropertyHelper.cs
@@ -45,8 +45,7 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
         }
 
         public static IXamlIlAvaloniaPropertyNode CreateNode(XamlIlAstTransformationContext context,
-            string propertyName, IXamlIlAstTypeReference selectorTypeReference, IXamlIlLineInfo lineInfo,
-            bool ignoreAttachedTargetType)
+            string propertyName, IXamlIlAstTypeReference selectorTypeReference, IXamlIlLineInfo lineInfo)
         {
             XamlIlAstNamePropertyReference forgedReference;
             
@@ -64,20 +63,14 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
                 xmlOwner += parsedPropertyName.owner;
                 
                 var tref = XamlIlTypeReferenceResolver.ResolveType(context, xmlOwner, false, lineInfo, true);
-                
-                if (ignoreAttachedTargetType)
-                {
-                    var propertyFieldName = parsedPropertyName.name + "Property";
-                    var found = tref.Type.GetAllFields()
-                        .FirstOrDefault(f => f.IsStatic && f.IsPublic && f.Name == propertyFieldName);
-                    if (found == null)
-                        throw new XamlIlParseException(
-                            $"Unable to find {propertyFieldName} field on type {tref.Type.GetFullName()}", lineInfo);
-                    return new XamlIlAvaloniaPropertyFieldNode(context.GetAvaloniaTypes(), lineInfo, found);
-                }
-                
-                forgedReference = new XamlIlAstNamePropertyReference(lineInfo,
-                    tref, parsedPropertyName.name, selectorTypeReference);
+
+                var propertyFieldName = parsedPropertyName.name + "Property";
+                var found = tref.Type.GetAllFields()
+                    .FirstOrDefault(f => f.IsStatic && f.IsPublic && f.Name == propertyFieldName);
+                if (found == null)
+                    throw new XamlIlParseException(
+                        $"Unable to find {propertyFieldName} field on type {tref.Type.GetFullName()}", lineInfo);
+                return new XamlIlAvaloniaPropertyFieldNode(context.GetAvaloniaTypes(), lineInfo, found);
             }
 
             var clrProperty =