diff --git a/src/libImaging/Pack.c b/src/libImaging/Pack.c
index 4afeb15b7..fdf5a72aa 100644
--- a/src/libImaging/Pack.c
+++ b/src/libImaging/Pack.c
@@ -648,10 +648,8 @@ static struct {
     {IMAGING_MODE_I_16B, IMAGING_RAWMODE_I_16B, 16, copy2},
     {IMAGING_MODE_I_16L, IMAGING_RAWMODE_I_16L, 16, copy2},
     {IMAGING_MODE_I_16N, IMAGING_RAWMODE_I_16N, 16, copy2},
-    {IMAGING_MODE_I_16,
-     IMAGING_RAWMODE_I_16N,
-     16,
-     packI16N_I16},  // LibTiff native->image endian.
+    // LibTiff native->image endian.
+    {IMAGING_MODE_I_16, IMAGING_RAWMODE_I_16N, 16, packI16N_I16},
     {IMAGING_MODE_I_16L, IMAGING_RAWMODE_I_16N, 16, packI16N_I16},
     {IMAGING_MODE_I_16B, IMAGING_RAWMODE_I_16N, 16, packI16N_I16B}
 };
diff --git a/src/libImaging/Unpack.c b/src/libImaging/Unpack.c
index 27ac7c467..ab5f2c158 100644
--- a/src/libImaging/Unpack.c
+++ b/src/libImaging/Unpack.c
@@ -1833,21 +1833,14 @@ static struct {
     {IMAGING_MODE_I_16N, IMAGING_RAWMODE_I_16N, 16, copy2},
 
     {IMAGING_MODE_I_16, IMAGING_RAWMODE_I_16B, 16, unpackI16B_I16},
-    {IMAGING_MODE_I_16,
-     IMAGING_RAWMODE_I_16N,
-     16,
-     unpackI16N_I16},  // LibTiff native->image endian.
-    {
-        IMAGING_MODE_I_16L, IMAGING_RAWMODE_I_16N, 16, unpackI16N_I16
-    },  // LibTiff native->image endian.
-    {IMAGING_MODE_I_16B, IMAGING_RAWMODE_I_16N, 16, unpackI16N_I16B},
-
     {IMAGING_MODE_I_16, IMAGING_RAWMODE_I_16R, 16, unpackI16R_I16},
 
-    {IMAGING_MODE_I_16,
-     IMAGING_RAWMODE_I_12,
-     12,
-     unpackI12_I16}  // 12 bit Tiffs stored in 16bits.
+    // LibTiff native->image endian.
+    {IMAGING_MODE_I_16, IMAGING_RAWMODE_I_16N, 16, unpackI16N_I16},
+    {IMAGING_MODE_I_16L, IMAGING_RAWMODE_I_16N, 16, unpackI16N_I16},
+
+    // 12 bit Tiffs stored in 16bits.
+    {IMAGING_MODE_I_16, IMAGING_RAWMODE_I_12, 12, unpackI12_I16}
 };
 
 ImagingShuffler