diff --git a/gralloc/QtiMapper.cpp b/gralloc/QtiMapper.cpp
index 14c788e..a885a7b 100644
--- a/gralloc/QtiMapper.cpp
+++ b/gralloc/QtiMapper.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
@@ -264,7 +264,6 @@
   return Void();
 }
 
-#ifdef ENABLE_QTI_MAPPER_EXTENSION
 Return<void> QtiMapper::getMapSecureBufferFlag(void *buffer, getMapSecureBufferFlag_cb hidl_cb) {
   auto err = Error::BAD_BUFFER;
   auto hnd = static_cast<private_handle_t *>(buffer);
@@ -393,7 +392,6 @@
   }
   return err;
 }
-#endif
 
 // Methods from ::android::hidl::base::V1_0::IBase follow.
 
@@ -405,6 +403,11 @@
   return static_cast<IMapper_2_1 *>(mapper);
 }
 
+IQtiMapper *HIDL_FETCH_IQtiMapper(const char * /* name */) {
+  ALOGD_IF(DEBUG, "Fetching QtiMapper");
+  return new QtiMapper();
+}
+
 }  // namespace implementation
 }  // namespace V1_0
 }  // namespace mapper