diff --git a/src/main/java/com/minelittlepony/client/model/races/ModelUnicorn.java b/src/main/java/com/minelittlepony/client/model/races/ModelUnicorn.java
index 16bb6b35..7fcf42f4 100644
--- a/src/main/java/com/minelittlepony/client/model/races/ModelUnicorn.java
+++ b/src/main/java/com/minelittlepony/client/model/races/ModelUnicorn.java
@@ -29,14 +29,6 @@ public class ModelUnicorn<T extends LivingEntity> extends ModelEarthPony<T> impl
         horn = new UnicornHorn(this, yOffset, stretch);
     }
 
-    @Override
-    protected void rotateLegsOnGround(float move, float swing, float ticks, T entity) {
-        super.rotateLegsOnGround(move, swing, ticks, entity);
-
-        unicornArmRight.yaw = 0;
-        unicornArmLeft.yaw = 0;
-    }
-
     @Override
     public float getWobbleAmount() {
         if (isCasting()) {
@@ -49,17 +41,8 @@ public class ModelUnicorn<T extends LivingEntity> extends ModelEarthPony<T> impl
     protected void rotateLegs(float move, float swing, float ticks, T entity) {
         super.rotateLegs(move, swing, ticks, entity);
 
-        unicornArmRight.setRotationPoint(-7, 12, -2);
-        unicornArmLeft.setRotationPoint(-7, 12, -2);
-
-        unicornArmLeft.roll = 0;
-        unicornArmRight.roll = 0;
-
-        unicornArmLeft.pitch = 0;
-        unicornArmRight.pitch = 0;
-
-        unicornArmLeft.yaw = 0;
-        unicornArmRight.yaw = 0;
+        unicornArmRight.rotate(0, 0, 0).around(-7, 12, -2);
+        unicornArmLeft.rotate(0, 0, 0).around(-7, 12, -2);
     }
 
     @Override