diff --git a/interface/src/avatar/MySkeletonModel.cpp b/interface/src/avatar/MySkeletonModel.cpp
index 0d7bd3f3b3..6fe199aaba 100755
--- a/interface/src/avatar/MySkeletonModel.cpp
+++ b/interface/src/avatar/MySkeletonModel.cpp
@@ -112,23 +112,19 @@ static AnimPose computeHipsInSensorFrame(MyAvatar* myAvatar, bool isFlying) {
 void MySkeletonModel::updateRig(float deltaTime, glm::mat4 parentTransform) {
     const HFMModel& hfmModel = getHFMModel();
 
+    MyAvatar* myAvatar = static_cast<MyAvatar*>(_owningAvatar);
+    assert(myAvatar);
+
     Head* head = _owningAvatar->getHead();
 
-    // AJT: blendshapes TODO: RE-enable this and avoid duplication with
-    // SkeletonModel::updateRig()
-    /*
-    bool eyePosesValid = !head->getHasProceduralEyeMovement();
+    bool eyePosesValid = (myAvatar->getControllerPoseInSensorFrame(controller::Action::LEFT_EYE).isValid() ||
+                          myAvatar->getControllerPoseInSensorFrame(controller::Action::RIGHT_EYE).isValid());
     glm::vec3 lookAt;
     if (eyePosesValid) {
         lookAt = head->getLookAtPosition(); // don't apply no-crosseyes code when eyes are being tracked
     } else {
         lookAt = avoidCrossedEyes(head->getLookAtPosition());
     }
-    */
-    glm::vec3 lookAt = avoidCrossedEyes(head->getLookAtPosition());
-
-    MyAvatar* myAvatar = static_cast<MyAvatar*>(_owningAvatar);
-    assert(myAvatar);
 
     Rig::ControllerParameters params;
 
diff --git a/libraries/avatars-renderer/src/avatars-renderer/SkeletonModel.cpp b/libraries/avatars-renderer/src/avatars-renderer/SkeletonModel.cpp
index fc16851942..ccc87c28f3 100644
--- a/libraries/avatars-renderer/src/avatars-renderer/SkeletonModel.cpp
+++ b/libraries/avatars-renderer/src/avatars-renderer/SkeletonModel.cpp
@@ -110,17 +110,6 @@ void SkeletonModel::updateRig(float deltaTime, glm::mat4 parentTransform) {
     assert(!_owningAvatar->isMyAvatar());
 
     Head* head = _owningAvatar->getHead();
-
-    // AJT: blendshapes TODO: RE-enable this. but move into rig?
-    /*
-    bool eyePosesValid = !head->getHasProceduralEyeMovement();
-    glm::vec3 lookAt;
-    if (eyePosesValid) {
-        lookAt = head->getLookAtPosition(); // don't apply no-crosseyes code etc when eyes are being tracked
-    } else {
-        lookAt = avoidCrossedEyes(head->getCorrectedLookAtPosition());
-    }
-    */
     glm::vec3 lookAt = avoidCrossedEyes(head->getCorrectedLookAtPosition());
 
     // no need to call Model::updateRig() because otherAvatars get their joint state
diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp
index 87d6c57d59..818902968f 100755
--- a/libraries/avatars/src/AvatarData.cpp
+++ b/libraries/avatars/src/AvatarData.cpp
@@ -2637,6 +2637,7 @@ enum class JsonAvatarFrameVersion : int {
     JointRotationsInAbsoluteFrame,
     JointDefaultPoseBits,
     JointUnscaledTranslations,
+    ARKitBlendshapes
 };
 
 QJsonValue toJsonValue(const JointData& joint) {
@@ -2681,7 +2682,7 @@ void AvatarData::avatarEntityDataToJson(QJsonObject& root) const {
 QJsonObject AvatarData::toJson() const {
     QJsonObject root;
 
-    root[JSON_AVATAR_VERSION] = (int)JsonAvatarFrameVersion::JointUnscaledTranslations;
+    root[JSON_AVATAR_VERSION] = (int)JsonAvatarFrameVersion::ARKitBlendshapes;
 
     if (!getSkeletonModelURL().isEmpty()) {
         root[JSON_AVATAR_BODY_MODEL] = getSkeletonModelURL().toString();
diff --git a/libraries/avatars/src/HeadData.cpp b/libraries/avatars/src/HeadData.cpp
index 93fb0190bb..5e8d5c457f 100644
--- a/libraries/avatars/src/HeadData.cpp
+++ b/libraries/avatars/src/HeadData.cpp
@@ -186,14 +186,7 @@ QJsonObject HeadData::toJson() const {
 void HeadData::fromJson(const QJsonObject& json) {
     if (json.contains(JSON_AVATAR_HEAD_BLENDSHAPE_COEFFICIENTS)) {
         auto jsonValue = json[JSON_AVATAR_HEAD_BLENDSHAPE_COEFFICIENTS];
-        if (jsonValue.isArray()) {
-            QVector<float> blendshapeCoefficients;
-            QJsonArray blendshapeCoefficientsJson = jsonValue.toArray();
-            for (const auto& blendshapeCoefficient : blendshapeCoefficientsJson) {
-                blendshapeCoefficients.push_back((float)blendshapeCoefficient.toDouble());
-            }
-            setBlendshapeCoefficients(blendshapeCoefficients);
-        } else if (jsonValue.isObject()) {
+        if (jsonValue.isObject()) {
             QJsonObject blendshapeCoefficientsJson = jsonValue.toObject();
             for (const QString& name : blendshapeCoefficientsJson.keys()) {
                 float value = (float)blendshapeCoefficientsJson[name].toDouble();