diff --git a/libraries/animation/src/AnimPose.cpp b/libraries/animation/src/AnimPose.cpp
index 5914031a3a..0c6af2d5bd 100644
--- a/libraries/animation/src/AnimPose.cpp
+++ b/libraries/animation/src/AnimPose.cpp
@@ -11,6 +11,7 @@
 #include "AnimPose.h"
 #include <GLMHelpers.h>
 #include <algorithm>
+#include <glm/gtc/matrix_transform.hpp>
 
 const AnimPose AnimPose::identity = AnimPose(glm::vec3(1.0f),
                                              glm::quat(),
@@ -18,7 +19,9 @@ const AnimPose AnimPose::identity = AnimPose(glm::vec3(1.0f),
 
 AnimPose::AnimPose(const glm::mat4& mat) {
     scale = extractScale(mat);
-    rot = glmExtractRotation(mat);
+    // quat_cast doesn't work so well with scaled matrices, so cancel it out.
+    glm::mat4 tmp = glm::scale(mat, 1.0f / scale);
+    rot = glm::normalize(glm::quat_cast(tmp));
     trans = extractTranslation(mat);
 }
 
diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp
index 0070b99591..7ab1129e2e 100644
--- a/libraries/render-utils/src/Model.cpp
+++ b/libraries/render-utils/src/Model.cpp
@@ -928,7 +928,7 @@ void Model::simulate(float deltaTime, bool fullUpdate) {
 //virtual
 void Model::updateRig(float deltaTime, glm::mat4 parentTransform) {
     _needsUpdateClusterMatrices = true;
-     _rig->updateAnimations(deltaTime, parentTransform);
+    _rig->updateAnimations(deltaTime, parentTransform);
 }
 void Model::simulateInternal(float deltaTime) {
     // update the world space transforms for all joints
diff --git a/libraries/shared/src/GLMHelpers.cpp b/libraries/shared/src/GLMHelpers.cpp
index 7c5ba6bb48..e6fbe5e5cc 100644
--- a/libraries/shared/src/GLMHelpers.cpp
+++ b/libraries/shared/src/GLMHelpers.cpp
@@ -279,14 +279,9 @@ glm::quat extractRotation(const glm::mat4& matrix, bool assumeOrthogonal) {
 
 glm::quat glmExtractRotation(const glm::mat4& matrix) {
     glm::vec3 scale = extractScale(matrix);
-    float maxScale = std::max(std::max(scale.x, scale.y), scale.z);
-    if (maxScale > 1.01f || maxScale <= 0.99f) {
-        // quat_cast doesn't work so well with scaled matrices, so cancel it out.
-        glm::mat4 tmp = glm::scale(matrix, 1.0f / scale);
-        return glm::normalize(glm::quat_cast(tmp));
-    } else {
-        return glm::normalize(glm::quat_cast(matrix));
-    }
+    // quat_cast doesn't work so well with scaled matrices, so cancel it out.
+    glm::mat4 tmp = glm::scale(matrix, 1.0f / scale);
+    return glm::normalize(glm::quat_cast(tmp));
 }
 
 glm::vec3 extractScale(const glm::mat4& matrix) {