diff --git a/src/gpu/GrSurfaceContext.cpp b/src/gpu/GrSurfaceContext.cpp
index 32048c3..71113b4 100644
--- a/src/gpu/GrSurfaceContext.cpp
+++ b/src/gpu/GrSurfaceContext.cpp
@@ -72,11 +72,9 @@
         case GrColorType::kRG_F32:           return false;
         case GrColorType::kRGBA_F32:         return true;
         case GrColorType::kRGB_ETC1:         return false;
+        // Experimental (for P016 and P010)
         case GrColorType::kR_16:             return false;
         case GrColorType::kRG_1616:          return false;
-        // Experimental (for Y416 and mutant P016/P010)
-        case GrColorType::kRGBA_16161616:    return false;
-        case GrColorType::kRG_half:          return false;
     }
     SK_ABORT("Invalid GrColorType");
     return false;
@@ -110,11 +108,9 @@
         case kAlpha_half_as_Red_GrPixelConfig:  return false;
         case kGray_8_as_Lum_GrPixelConfig:      return false;
         case kGray_8_as_Red_GrPixelConfig:      return false;
+        // Experimental (for P016 and P010)
         case kR_16_GrPixelConfig:               return false;
         case kRG_1616_GrPixelConfig:            return false;
-        // Experimental (for Y416 and mutant P016/P010)
-        case kRGBA_16161616_GrPixelConfig:      return false;
-        case kRG_half_GrPixelConfig:            return false;
     }
     SK_ABORT("Invalid GrPixelConfig");
     return false;