diff --git a/src/com/android/camera/util/ApiHelper.java b/src/com/android/camera/util/ApiHelper.java
index 624cbf2..046a9f9 100644
--- a/src/com/android/camera/util/ApiHelper.java
+++ b/src/com/android/camera/util/ApiHelper.java
@@ -70,7 +70,6 @@
     public static final boolean IS_NEXUS_9 = "htc".equalsIgnoreCase(Build.MANUFACTURER)
             && ("flounder".equalsIgnoreCase(Build.DEVICE)
                  || "flounder_lte".equalsIgnoreCase(Build.DEVICE));
-    public static final boolean IS_HTC = "htc".equalsIgnoreCase(Build.MANUFACTURER);
 
     public static final boolean HAS_CAMERA_2_API = isLOrHigher();
 
diff --git a/src/com/android/camera/util/CameraUtil.java b/src/com/android/camera/util/CameraUtil.java
index 71e15cb..d617038 100644
--- a/src/com/android/camera/util/CameraUtil.java
+++ b/src/com/android/camera/util/CameraUtil.java
@@ -486,16 +486,11 @@
      */
     public static int getOptimalPreviewSizeIndex(Context context,
             List<Size> sizes, double targetRatio) {
-        // Use a very small tolerance because we want an exact match.
-        final double aspectRatioTolerance;
-        // HTC 4:3 ratios is over .01 from true 4:3, targeted fix for those
-        // devices here, see b/18241645
-        if (ApiHelper.IS_HTC && targetRatio > 1.3433 && targetRatio < 1.35) {
-            Log.w(TAG, "4:3 ratio out of normal tolerance, increasing tolerance to 0.02");
-            aspectRatioTolerance = 0.02;
-        } else {
-            aspectRatioTolerance = 0.01;
-        }
+        // Use a very small tolerance because we want an exact match. HTC 4:3
+        // ratios is over .01 from true 4:3, so this value must be above .01,
+        // see b/18241645.
+        final double aspectRatioTolerance = 0.02;
+
         return getOptimalPreviewSizeIndex(context, sizes, targetRatio, aspectRatioTolerance);
     }