diff --git a/common.mk b/common.mk
index 921f570..975795c 100644
--- a/common.mk
+++ b/common.mk
@@ -268,7 +268,6 @@ PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/media/init.qti.media.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.qti.media.rc
 
 PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/media/lahaina/media_profiles_lahaina.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_vendor.xml \
     $(LOCAL_PATH)/media/media_codecs_vendor_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_vendor_audio.xml
 
 PRODUCT_COPY_FILES += \
diff --git a/media/init.qti.media.rc b/media/init.qti.media.rc
index 0937b56..6272b3c 100644
--- a/media/init.qti.media.rc
+++ b/media/init.qti.media.rc
@@ -48,6 +48,7 @@ on early-init
 on post-fs-data
     setprop ro.media.xml_variant.codecs ${vendor.media.target_variant}
     setprop ro.media.xml_variant.codecs_performance ${vendor.media.target_variant}
+    setprop ro.media.xml_variant.profiles ${vendor.media.target_variant}
 
 on property:vendor.netflix.bsp_rev=*
     setprop ro.netflix.bsp_rev ${vendor.netflix.bsp_rev}
diff --git a/system.prop b/system.prop
index 9ad5ca0..f74762e 100644
--- a/system.prop
+++ b/system.prop
@@ -19,7 +19,6 @@ persist.dbg.wfc_avail_ovr=1
 
 # Media
 media.aac_51_output_enabled=true
-media.settings.xml=/vendor/etc/media_profiles_vendor.xml
 media.stagefright.enable-aac=true
 media.stagefright.enable-fma2dp=true
 media.stagefright.enable-http=true