diff --git a/README.chromium b/README.chromium
index fc2750525..ee3a0612b 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,6 +1,6 @@
 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 863
+Version: 864
 License: BSD
 License File: LICENSE
 
diff --git a/include/libyuv/version.h b/include/libyuv/version.h
index 33aa3815b..1516076d9 100644
--- a/include/libyuv/version.h
+++ b/include/libyuv/version.h
@@ -11,6 +11,6 @@
 #ifndef INCLUDE_LIBYUV_VERSION_H_  // NOLINT
 #define INCLUDE_LIBYUV_VERSION_H_
 
-#define LIBYUV_VERSION 863
+#define LIBYUV_VERSION 864
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_  NOLINT
diff --git a/source/scale.cc b/source/scale.cc
index 2f039e148..63ef27045 100644
--- a/source/scale.cc
+++ b/source/scale.cc
@@ -870,7 +870,7 @@ static void ScaleAddRows_SSE2(const uint8* src_ptr, ptrdiff_t src_stride,
   }
 }
 
-// Bilinear row filtering combines 2x1 -> 1x1. SSSE3 version.
+// Bilinear column filtering. SSSE3 version.
 // TODO(fbarchard): Port to Neon
 
 #define HAS_SCALEFILTERCOLS_SSSE3
@@ -1681,7 +1681,7 @@ static void ScaleAddRows_SSE2(const uint8* src_ptr, ptrdiff_t src_stride,
   );
 }
 
-// Bilinear row filtering combines 4x2 -> 4x1. SSSE3 version
+// Bilinear column filtering. SSSE3 version.
 #define HAS_SCALEFILTERCOLS_SSSE3
 static void ScaleFilterCols_SSSE3(uint8* dst_ptr, const uint8* src_ptr,
                                   int dst_width, int x, int dx) {
@@ -1730,10 +1730,10 @@ static void ScaleFilterCols_SSSE3(uint8* dst_ptr, const uint8* src_ptr,
     "jl        99f                             \n"
     "movzwl    (%1,%3,1),%k2                   \n"
     "movd      %k2,%%xmm0                      \n"
-    "psrlw     $0x9,%%xmm1                     \n"
-    "pshufb    %%xmm5,%%xmm1                   \n"
-    "pxor      %%xmm6,%%xmm1                   \n"
-    "pmaddubsw %%xmm1,%%xmm0                   \n"
+    "psrlw     $0x9,%%xmm2                     \n"
+    "pshufb    %%xmm5,%%xmm2                   \n"
+    "pxor      %%xmm6,%%xmm2                   \n"
+    "pmaddubsw %%xmm2,%%xmm0                   \n"
     "psrlw     $0x7,%%xmm0                     \n"
     "packuswb  %%xmm0,%%xmm0                   \n"
     "movd      %%xmm0,%k2                      \n"
diff --git a/unit_test/scale_argb_test.cc b/unit_test/scale_argb_test.cc
index b4057e130..f04088b17 100644
--- a/unit_test/scale_argb_test.cc
+++ b/unit_test/scale_argb_test.cc
@@ -218,15 +218,15 @@ static int ARGBClipTestFilter(int src_width, int src_height,
     TEST_FACTOR1(name, Bilinear, hfactor, vfactor, 2)
 
 // TODO(fbarchard): ScaleDownBy1 should be lossless, but Box has error of 2.
-// TEST_FACTOR(1, 1 / 1, 1 / 1)
+TEST_FACTOR(1, 1 / 1, 1 / 1)
 TEST_FACTOR(2, 1 / 2, 1 / 2)
-// TEST_FACTOR(4, 1 / 4, 1 / 4)
-// TEST_FACTOR(8, 1 / 8, 1 / 8)
-// TEST_FACTOR(16, 1 / 16, 1 / 16)
-// TEST_FACTOR(2by3, 2 / 3, 2 / 3)
-// TEST_FACTOR(3by4, 3 / 4, 3 / 4)
-// TEST_FACTOR(3by8, 3 / 8, 3 / 8)
-// TEST_FACTOR(Vertical2by3, 1, 2 / 3)
+TEST_FACTOR(4, 1 / 4, 1 / 4)
+TEST_FACTOR(8, 1 / 8, 1 / 8)
+TEST_FACTOR(16, 1 / 16, 1 / 16)
+TEST_FACTOR(2by3, 2 / 3, 2 / 3)
+TEST_FACTOR(3by4, 3 / 4, 3 / 4)
+TEST_FACTOR(3by8, 3 / 8, 3 / 8)
+TEST_FACTOR(Vertical2by3, 1, 2 / 3)
 #undef TEST_FACTOR1
 #undef TEST_FACTOR
 
@@ -262,11 +262,11 @@ TEST_FACTOR(2, 1 / 2, 1 / 2)
     TEST_SCALETO1(name, width, height, Linear, 2)                              \
     TEST_SCALETO1(name, width, height, Bilinear, 2)
 
-TEST_SCALETO(DISABLED_ARGBScale, 640, 360)
-TEST_SCALETO(DISABLED_ARGBScale, 853, 480)
+TEST_SCALETO(ARGBScale, 640, 360)
+TEST_SCALETO(ARGBScale, 853, 480)
 TEST_SCALETO(ARGBScale, 1280, 720)
-TEST_SCALETO(DISABLED_ARGBScale, 1280, 800)
-TEST_SCALETO(DISABLED_ARGBScale, 1366, 768)
+TEST_SCALETO(ARGBScale, 1280, 800)
+TEST_SCALETO(ARGBScale, 1366, 768)
 TEST_SCALETO(ARGBScale, 1920, 1080)
 #undef TEST_SCALETO1
 #undef TEST_SCALETO
diff --git a/unit_test/scale_test.cc b/unit_test/scale_test.cc
index 9cba4124f..9442edb0b 100644
--- a/unit_test/scale_test.cc
+++ b/unit_test/scale_test.cc
@@ -150,15 +150,15 @@ static int TestFilter(int src_width, int src_height,
     TEST_FACTOR1(name, Box, hfactor, vfactor, 3)                               \
 
 // TODO(fbarchard): ScaleDownBy1 should be lossless, but Box has error of 2.
-// TEST_FACTOR(1, 1 / 1, 1 / 1)
+TEST_FACTOR(1, 1 / 1, 1 / 1)
 TEST_FACTOR(2, 1 / 2, 1 / 2)
-// TEST_FACTOR(4, 1 / 4, 1 / 4)
-// TEST_FACTOR(8, 1 / 8, 1 / 8)
-// TEST_FACTOR(16, 1 / 16, 1 / 16)
-// TEST_FACTOR(2by3, 2 / 3, 2 / 3)
-// TEST_FACTOR(3by4, 3 / 4, 3 / 4)
-// TEST_FACTOR(3by8, 3 / 8, 3 / 8)
-// TEST_FACTOR(Vertical2by3, 1, 2 / 3)
+TEST_FACTOR(4, 1 / 4, 1 / 4)
+TEST_FACTOR(8, 1 / 8, 1 / 8)
+TEST_FACTOR(16, 1 / 16, 1 / 16)
+TEST_FACTOR(2by3, 2 / 3, 2 / 3)
+TEST_FACTOR(3by4, 3 / 4, 3 / 4)
+TEST_FACTOR(3by8, 3 / 8, 3 / 8)
+TEST_FACTOR(Vertical2by3, 1, 2 / 3)
 #undef TEST_FACTOR1
 #undef TEST_FACTOR
 
@@ -183,12 +183,12 @@ TEST_FACTOR(2, 1 / 2, 1 / 2)
     TEST_SCALETO1(name, width, height, Bilinear, 3)                            \
     TEST_SCALETO1(name, width, height, Box, 3)
 
-TEST_SCALETO(DISABLED_Scale, 640, 360)
-TEST_SCALETO(DISABLED_Scale, 853, 480)
+TEST_SCALETO(Scale, 640, 360)
+TEST_SCALETO(Scale, 853, 480)
 TEST_SCALETO(Scale, 1280, 720)
-TEST_SCALETO(DISABLED_Scale, 1280, 800)
-TEST_SCALETO(DISABLED_Scale, 1366, 768)
-TEST_SCALETO(DISABLED_Scale, 1920, 1080)
+TEST_SCALETO(Scale, 1280, 800)
+TEST_SCALETO(Scale, 1366, 768)
+TEST_SCALETO(Scale, 1920, 1080)
 #undef TEST_SCALETO1
 #undef TEST_SCALETO