diff --git a/common-proprietary-files.txt b/common-proprietary-files.txt
index 4366dd3..d9cc622 100644
--- a/common-proprietary-files.txt
+++ b/common-proprietary-files.txt
@@ -219,17 +219,12 @@ lib/hw/consumerir.default.so
 
 # DRM
 bin/qseecomd
-vendor/lib/drm/libdrmwvmplugin.so
 vendor/lib/libdrmdiag.so
 vendor/lib/libdrmfs.so
 vendor/lib/libdrmtime.so
 vendor/lib/libQSEEComAPI.so
 vendor/lib/librpmb.so
 vendor/lib/libssd.so
-vendor/lib/libwvdrm_L3.so
-vendor/lib/libwvm.so
-vendor/lib/libWVStreamControlAPI_L3.so
-vendor/lib/mediadrm/libwvdrmengine.so
 
 # Graphics firmware
 etc/firmware/a330_pfp.fw
@@ -290,3 +285,10 @@ etc/wifi/nvram_net.txt_a0
 etc/wifi/nvram_net.txt_muratafem1
 etc/wifi/nvram_net.txt_semco3rd
 etc/wifi/wpa_supplicant.conf
+
+# Widevine
+vendor/lib/libwvdrm_L1.so|3eaf8ed1cb337608a1ccdb80d2c95804e7aea323
+vendor/lib/libwvm.so|59c4c078f4b897ddac8f665309b7a3f25522f207
+vendor/lib/libWVStreamControlAPI_L1.so|6b28492ac55b9a3d86993343cf2c8b55240b3420
+vendor/lib/drm/libdrmwvmplugin.so|3bee766222895f524421eb996ca6a08bcf95f19f
+vendor/lib/mediadrm/libwvdrmengine.so|6bdcc4d59b07ccbdd7b07a99677406ade3d2e232
diff --git a/klte.mk b/klte.mk
index eb7d1d7..9dd95e0 100644
--- a/klte.mk
+++ b/klte.mk
@@ -125,10 +125,6 @@ PRODUCT_PACKAGES += \
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/configs/thermal-engine-8974.conf:system/etc/thermal-engine-8974.conf
 
-# Widevine
-PRODUCT_PACKAGES += \
-    libshim_wvm
-
 # Wifi
 PRODUCT_PACKAGES += \
     libnetcmdiface \
diff --git a/libshims/Android.mk b/libshims/Android.mk
index 7840c03..29ed69c 100644
--- a/libshims/Android.mk
+++ b/libshims/Android.mk
@@ -7,11 +7,3 @@ LOCAL_MODULE := libshim_ril
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 include $(BUILD_SHARED_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := wvm_shim.cpp
-LOCAL_SHARED_LIBRARIES := libstagefright_foundation
-LOCAL_MODULE := libshim_wvm
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-include $(BUILD_SHARED_LIBRARY)
diff --git a/libshims/wvm_shim.cpp b/libshims/wvm_shim.cpp
deleted file mode 100644
index ca0376b..0000000
--- a/libshims/wvm_shim.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (C) 2016 The CyanogenMod Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/* MediaBufferGroup::MediaBufferGroup */
-extern "C" int _ZN7android16MediaBufferGroupC1Ej();
-extern "C" int _ZN7android16MediaBufferGroupC1Ev() {
-    return _ZN7android16MediaBufferGroupC1Ej();
-}
diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc
index f1b364d..40b263d 100644
--- a/rootdir/etc/init.qcom.rc
+++ b/rootdir/etc/init.qcom.rc
@@ -29,7 +29,7 @@ import init.qcom.usb.rc
 import init.target.rc
 
 on early-init
-    export LD_SHIM_LIBS "/system/lib/libril.so|libshim_ril.so:/system/vendor/lib/libwvm.so|libshim_wvm.so"
+    export LD_SHIM_LIBS /system/lib/libril.so|libshim_ril.so
 
     mount debugfs debugfs /sys/kernel/debug
     chmod 0755 /sys/kernel/debug