diff --git a/device.mk b/device.mk
index 471b6b5..c4e5d69 100644
--- a/device.mk
+++ b/device.mk
@@ -57,6 +57,9 @@ PRODUCT_PACKAGES += \
     wpa_supplicant.conf \
     WifiOverlay
 
+PRODUCT_COPY_FILES += \
+    $(DEVICE_PATH)/macloader/macloader:$(TARGET_COPY_OUT_VENDOR)/bin/hw/macloader
+
 # Wi-Fi Display
 PRODUCT_PACKAGES += \
     libnl
diff --git a/extract-files.sh b/extract-files.sh
index 389a22d..9ee7f71 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -22,11 +22,6 @@ function blob_fixup() {
         vendor/firmware/wlan/qcom_cfg.ini)
             sed -i 's/swlan0/wlan1/g' "${2}"
             sed -i 's/gChannelBondingMode24GHz=0/gChannelBondingMode24GHz=1/g' "${2}"
-            ;;
-        vendor/bin/hw/macloader)
-            sed -i 's/vendor\.wifi\.dualconcurrent\.interface/vnedor\.wiff\.dualconcurreut\.iuterface/g' "${2}"
-            sed -i 's/ro\.vendor\.wifi\.sap\.interface/ru\.vnedor\.wiff\.sep\.iuterface/g' "${2}"
-            ;;
     esac
 }
 
diff --git a/macloader/macloader b/macloader/macloader
new file mode 100755
index 0000000..0db1b2f
--- /dev/null
+++ b/macloader/macloader
@@ -0,0 +1,7 @@
+#! /vendor/bin/sh
+
+# Load mac address
+cat /mnt/vendor/efs/wifi/.mac.info > /sys/wifi/mac_addr
+
+# Load the driver
+echo 1 > /sys/kernel/boot_wlan/boot_wlan
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 9052e52..ea6e518 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -83,7 +83,6 @@ vendor/tee/00000000-0000-0000-0000-657365636f6d
 vendor/tee/driver/00000000-0000-0000-0000-53626f786476
 
 # Wi-Fi
--vendor/bin/hw/macloader
 vendor/etc/init/wifi_qcom_ap_exynos.rc
 vendor/etc/init/wifi.rc
 vendor/etc/wifi/indoorchannel.info