diff --git a/chromium-browser.sh b/chromium-browser.sh
index fcb81a33..7e077dce 100755
--- a/chromium-browser.sh
+++ b/chromium-browser.sh
@@ -39,9 +39,6 @@ export CHROME_VERSION_EXTRA="Built from source for @@BUILD_TARGET@@"
 # We don't want bug-buddy intercepting our crashes. http://crbug.com/24120
 export GNOME_DISABLE_CRASH_DIALOG=SET_BY_GOOGLE_CHROME
 
-# Disable allow_rgb_configs to fix odd color and vaapi issues with Mesa
-export allow_rgb10_configs=false
-
 CHROMIUM_DISTRO_FLAGS=" --enable-plugins \
                         --enable-extensions \
                         --enable-user-scripts \
@@ -49,6 +46,7 @@ CHROMIUM_DISTRO_FLAGS=" --enable-plugins \
                         --enable-gpu-rasterization \
                         --enable-sync \
                         --disable-features=AudioServiceSandbox,UseChromeOSDirectVideoDecoder \
+                        --enable-features=VaapiVideoDecoder,VaapiVideoEncoder \
                         --auto-ssl-client-auth @@EXTRA_FLAGS@@"
 
 # This provides a much better experience on Wayland.
diff --git a/chromium.spec b/chromium.spec
index 30475731..1c0ebcab 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -576,7 +576,7 @@ Requires: libusbx >= 1.0.21-0.1.git448584a
 BuildRequires: libusbx-devel >= 1.0.21-0.1.git448584a
 %endif
 
-%if 0%{use_vaapi}
+%if 0%{?use_vaapi}
 BuildRequires:	libva-devel
 %endif
 
@@ -1025,7 +1025,7 @@ udev.
 %endif
 
 # Feature specific patches
-%if %{use_vaapi}
+%if 0%{?use_vaapi}
 %patch202 -p1 -b .accel-mjpeg
 %patch205 -p1 -b .vaapi-intel-fix
 %patch206 -p1 -b .wayland-vaapi
@@ -1277,7 +1277,7 @@ CHROMIUM_BROWSER_GN_DEFINES+=' blink_symbol_level=0 enable_hangout_services_exte
 CHROMIUM_BROWSER_GN_DEFINES+=' use_aura=true'
 CHROMIUM_BROWSER_GN_DEFINES+=' enable_widevine=true'
 
-%if %{use_vaapi}
+%if 0%{?use_vaapi}
 CHROMIUM_BROWSER_GN_DEFINES+=' use_vaapi=true'
 %else
 CHROMIUM_BROWSER_GN_DEFINES+=' use_vaapi=false'
@@ -1398,7 +1398,12 @@ rm -rf %{buildroot}
 
 mkdir -p %{buildroot}%{_bindir}
 mkdir -p %{buildroot}%{chromium_path}/locales
+
+%if 0%{?use_vaapi}
 cp -a %{SOURCE3} %{buildroot}%{chromium_path}/%{chromium_browser_channel}.sh
+%%else
+grep -v features /usr/bin/chromium-browser > %{buildroot}%{chromium_path}/%{chromium_browser_channel}.sh
+%endif
 
 export BUILD_TARGET=`cat /etc/redhat-release`
 export CHROMIUM_PATH=%{chromium_path}