Okay I guess the previous commit means we're reverting the original fix?

shared-data/python/opentrons_shared_data/pipette/model_constants.py

@@ -95,10 +95,7 @@
         "liquid_properties",
         "default",
         "supportedTips",
-        # FIX BEFORE MERGE: I do not understand this. Is this right? What is the
-        # intended difference between ##EACHTIP## and ##EACHTIPTYPE##? Why was
-        # ##EACHTIP## raising in the first place?
-        "##EACHTIPTYPE##",
+        "##EACHTIP##",
         "defaultTipLength",
     ],
 }