diff --git a/README.chromium b/README.chromium
index 4efd81767..6d2203268 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,9 +1,8 @@
 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 1194
+Version: 1195
 License: BSD
 License File: LICENSE
 
 Description:
-libyuv is an open source project that includes
-YUV conversion and scaling functionality.
+libyuv is an open source project that includes YUV conversion and scaling functionality.
diff --git a/include/libyuv/row.h b/include/libyuv/row.h
index 0571f38e7..620efbb5f 100644
--- a/include/libyuv/row.h
+++ b/include/libyuv/row.h
@@ -186,15 +186,15 @@ extern "C" {
     defined(CLANG_HAS_AVX2) || defined(GCC_HAS_AVX2))
 #define HAS_ARGBCOPYALPHAROW_AVX2
 #define HAS_ARGBCOPYYTOALPHAROW_AVX2
-#define HAS_ARGBMIRRORROW_AVX2
+//#define HAS_ARGBMIRRORROW_AVX2
 #define HAS_ARGBPOLYNOMIALROW_AVX2
 #define HAS_ARGBSHUFFLEROW_AVX2
-#define HAS_ARGBTOUVROW_AVX2
-#define HAS_ARGBTOYJROW_AVX2
-#define HAS_ARGBTOYROW_AVX2
+//#define HAS_ARGBTOUVROW_AVX2
+//#define HAS_ARGBTOYJROW_AVX2
+//#define HAS_ARGBTOYROW_AVX2
 #define HAS_COPYROW_AVX
 #define HAS_I422TOABGRROW_AVX2
-#define HAS_I422TOARGBROW_AVX2
+//#define HAS_I422TOARGBROW_AVX2
 #define HAS_I422TOBGRAROW_AVX2
 #define HAS_I422TORGBAROW_AVX2
 #define HAS_INTERPOLATEROW_AVX2
@@ -203,7 +203,7 @@ extern "C" {
 #define HAS_SPLITUVROW_AVX2
 #define HAS_UYVYTOUV422ROW_AVX2
 #define HAS_UYVYTOUVROW_AVX2
-#define HAS_UYVYTOYROW_AVX2
+//#define HAS_UYVYTOYROW_AVX2
 #define HAS_YUY2TOUV422ROW_AVX2
 #define HAS_YUY2TOUVROW_AVX2
 #define HAS_YUY2TOYROW_AVX2
diff --git a/include/libyuv/version.h b/include/libyuv/version.h
index 793a5a261..510d671a4 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 1194
+#define LIBYUV_VERSION 1195
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_  NOLINT
diff --git a/source/row_posix.cc b/source/row_posix.cc
index d7b71bf6c..7c433ee9f 100644
--- a/source/row_posix.cc
+++ b/source/row_posix.cc
@@ -2267,7 +2267,6 @@ void I422ToBGRARow_AVX2(const uint8* y_buf,
 }
 #endif  // HAS_I422TOBGRAROW_AVX2
 
-#if defined(HAS_I422TOARGBROW_AVX2)
 // Read 8 UV from 422, upsample to 16 UV.
 #define READYUV422_AVX2                                                        \
     "vmovq       " MEMACCESS([u_buf]) ",%%xmm0                      \n"        \
@@ -2301,6 +2300,7 @@ void I422ToBGRARow_AVX2(const uint8* y_buf,
     "vpackuswb   %%ymm1,%%ymm1,%%ymm1           \n"                            \
     "vpackuswb   %%ymm2,%%ymm2,%%ymm2           \n"
 
+#if defined(HAS_I422TOARGBROW_AVX2)
 // 16 pixels
 // 8 UV values upsampled to 16 UV, mixed with 16 Y producing 16 ARGB (64 bytes).
 void OMITFP I422ToARGBRow_AVX2(const uint8* y_buf,