diff --git a/BoardConfig.mk b/BoardConfig.mk
index c51603f1..0d12c3ae 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -107,4 +107,3 @@ USES_DEVICE_GOOGLE_WAHOO := true
 # Graphics
 TARGET_USES_GRALLOC1 := true
 TARGET_USES_HWC2 := true
-TARGET_USES_HWC2ON1ADAPTER := true
diff --git a/device.mk b/device.mk
index 34567dd4..171ae683 100644
--- a/device.mk
+++ b/device.mk
@@ -202,11 +202,12 @@ PRODUCT_COPY_FILES += \
 
 PRODUCT_PACKAGES += \
     hwcomposer.msm8998 \
+    android.hardware.graphics.composer@2.1-impl \
+    android.hardware.graphics.composer@2.1-service \
     gralloc.msm8998 \
     android.hardware.graphics.allocator@2.0-impl \
     android.hardware.graphics.allocator@2.0-service \
     android.hardware.graphics.mapper@2.0-impl \
-    android.hardware.graphics.composer@2.1-impl \
     libbt-vendor
 
 # Light HAL
diff --git a/manifest.xml b/manifest.xml
index 1e0d8db8..69133117 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -21,6 +21,12 @@
         <impl level="generic"></impl>
         <version>2.0</version>
     </hal>
+    <hal format="hidl">
+        <name>android.hardware.graphics.composer</name>
+        <transport>hwbinder</transport>
+        <impl level="generic"></impl>
+        <version>2.1</version>
+    </hal>
     <hal format="hidl">
         <name>android.hardware.graphics.mapper</name>
         <transport arch="32+64">passthrough</transport>
diff --git a/sepolicy/hal_graphics_composer_default.te b/sepolicy/hal_graphics_composer_default.te
new file mode 100644
index 00000000..0113981e
--- /dev/null
+++ b/sepolicy/hal_graphics_composer_default.te
@@ -0,0 +1,8 @@
+# Binder access (for display.qservice)
+# TODO remove after the HAL is fixed
+binder_service(hal_graphics_composer_default)
+binder_use(hal_graphics_composer_default)
+allow hal_graphics_composer_default surfaceflinger_service:service_manager { add find };
+
+# HWC_UeventThread
+allow hal_graphics_composer_default self:netlink_kobject_uevent_socket create_socket_perms_no_ioctl;