diff --git a/Android.mk b/Android.mk
index ba2c728..ba187a6 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,4 +1,3 @@
 ifneq ($(TARGET_SIMULATOR),true)
-use_e2fsprogs_module_tags := optional
 include $(call all-subdir-makefiles)
 endif
diff --git a/e2fsck/Android.mk b/e2fsck/Android.mk
index bb98cf6..39a9d25 100644
--- a/e2fsck/Android.mk
+++ b/e2fsck/Android.mk
@@ -48,7 +48,7 @@
 LOCAL_CFLAGS := $(libext2_profile_cflags)
 LOCAL_PRELINK_MODULE := false
 LOCAL_MODULE := libext2_profile
-LOCAL_MODULE_TAGS := $(use_e2fsprog_module_tags)
+LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_SHARED_LIBRARY)
 
@@ -61,7 +61,7 @@
 LOCAL_PRELINK_MODULE := false
 LOCAL_MODULE := libext2_profile_host
 LOCAL_MODULE_STEM := libext2_profile
-LOCAL_MODULE_TAGS := $(use_e2fsprog_module_tags)
+LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_HOST_SHARED_LIBRARY)
 
@@ -144,7 +144,7 @@
 LOCAL_SYSTEM_SHARED_LIBRARIES := $(e2fsck_system_shared_libraries)
 LOCAL_SHARED_LIBRARIES := $(e2fsck_shared_libraries)
 LOCAL_MODULE := e2fsck
-LOCAL_MODULE_TAGS := $(use_e2fsprog_module_tags)
+LOCAL_MODULE_TAGS := optional
 include $(BUILD_EXECUTABLE)
 
 include $(CLEAR_VARS)
@@ -155,6 +155,6 @@
 LOCAL_SHARED_LIBRARIES := $(e2fsck_shared_libraries)
 LOCAL_MODULE := e2fsck_host
 LOCAL_MODULE_STEM := e2fsck
-LOCAL_MODULE_TAGS := $(use_e2fsprog_module_tags)
+LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_HOST_EXECUTABLE)
diff --git a/lib/blkid/Android.mk b/lib/blkid/Android.mk
index 87af46a..4cbd4e2 100644
--- a/lib/blkid/Android.mk
+++ b/lib/blkid/Android.mk
@@ -57,7 +57,7 @@
 LOCAL_CFLAGS := $(libext2_blkid_cflags) $(libext2_blkid_cflags_linux)
 LOCAL_PRELINK_MODULE := false
 LOCAL_MODULE := libext2_blkid
-LOCAL_MODULE_TAGS:= $(use_e2fsprog_module_tags)
+LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_SHARED_LIBRARY)
 
@@ -74,6 +74,6 @@
 LOCAL_PRELINK_MODULE := false
 LOCAL_MODULE := libext2_blkid_host
 LOCAL_MODULE_STEM := libext2_blkid
-LOCAL_MODULE_TAGS:= $(use_e2fsprog_module_tags)
+LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_HOST_SHARED_LIBRARY)
diff --git a/lib/e2p/Android.mk b/lib/e2p/Android.mk
index 79a29e6..e8b0211 100644
--- a/lib/e2p/Android.mk
+++ b/lib/e2p/Android.mk
@@ -59,7 +59,7 @@
 LOCAL_SYSTEM_SHARED_LIBRARIES := $(libext2_e2p_system_shared_libraries)
 LOCAL_PRELINK_MODULE := false
 LOCAL_MODULE := libext2_e2p
-LOCAL_MODULE_TAGS := $(use_e2fsprog_module_tags)
+LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_SHARED_LIBRARY)
 
@@ -71,6 +71,6 @@
 LOCAL_PRELINK_MODULE := false
 LOCAL_MODULE := libext2_e2p_host
 LOCAL_MODULE_STEM := libext2_e2p
-LOCAL_MODULE_TAGS := $(use_e2fsprog_module_tags)
+LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_HOST_SHARED_LIBRARY)
diff --git a/lib/et/Android.mk b/lib/et/Android.mk
index a7da0e7..8e442f0 100644
--- a/lib/et/Android.mk
+++ b/lib/et/Android.mk
@@ -45,7 +45,7 @@
 LOCAL_CFLAGS := $(libext2_com_err_cflags) $(libext2_com_err_cflags_linux)
 LOCAL_SYSTEM_SHARED_LIBRARIES := libc
 LOCAL_MODULE := libext2_com_err
-LOCAL_MODULE_TAGS := $(use_e2fsprog_module_tags)
+LOCAL_MODULE_TAGS := optional
 LOCAL_PRELINK_MODULE := false
 
 include $(BUILD_SHARED_LIBRARY)
@@ -61,7 +61,7 @@
 endif
 LOCAL_MODULE := libext2_com_err_host
 LOCAL_MODULE_STEM := libext2_com_err
-LOCAL_MODULE_TAGS := $(use_e2fsprog_module_tags)
+LOCAL_MODULE_TAGS := optional
 LOCAL_PRELINK_MODULE := false
 
 include $(BUILD_HOST_SHARED_LIBRARY)
diff --git a/lib/ext2fs/Android.mk b/lib/ext2fs/Android.mk
index 2de0ac6..6ce9f98 100644
--- a/lib/ext2fs/Android.mk
+++ b/lib/ext2fs/Android.mk
@@ -109,7 +109,7 @@
 LOCAL_CFLAGS := $(libext2fs_cflags) $(libext2fs_cflags_linux)
 LOCAL_PRELINK_MODULE := false
 LOCAL_MODULE := libext2fs
-LOCAL_MODULE_TAGS := $(use_e2fsprog_module_tags)
+LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_SHARED_LIBRARY)
 
@@ -126,6 +126,6 @@
 LOCAL_PRELINK_MODULE := false
 LOCAL_MODULE := libext2fs_host
 LOCAL_MODULE_STEM := libext2fs
-LOCAL_MODULE_TAGS := $(use_e2fsprog_module_tags)
+LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_HOST_SHARED_LIBRARY)
diff --git a/lib/uuid/Android.mk b/lib/uuid/Android.mk
index b7d2f67..7701514 100644
--- a/lib/uuid/Android.mk
+++ b/lib/uuid/Android.mk
@@ -50,7 +50,7 @@
 LOCAL_CFLAGS := $(libext2_uuid_cflags)
 LOCAL_SYSTEM_SHARED_LIBRARIES := $(libext2_uuid_system_shared_libraries)
 LOCAL_MODULE := libext2_uuid
-LOCAL_MODULE_TAGS:= $(use_e2fsprog_module_tags)
+LOCAL_MODULE_TAGS := optional
 LOCAL_PRELINK_MODULE := false
 
 include $(BUILD_SHARED_LIBRARY)
@@ -62,7 +62,7 @@
 LOCAL_CFLAGS := $(libext2_uuid_cflags)
 LOCAL_MODULE := libext2_uuid_host
 LOCAL_MODULE_STEM := libext2_uuid
-LOCAL_MODULE_TAGS:= $(use_e2fsprog_module_tags)
+LOCAL_MODULE_TAGS := optional
 LOCAL_PRELINK_MODULE := false
 
 include $(BUILD_HOST_SHARED_LIBRARY)
diff --git a/misc/Android.mk b/misc/Android.mk
index 743f6bb..8c5a21a 100644
--- a/misc/Android.mk
+++ b/misc/Android.mk
@@ -60,7 +60,7 @@
 LOCAL_SYSTEM_SHARED_LIBRARIES := $(mke2fs_system_shared_libraries)
 LOCAL_SHARED_LIBRARIES := $(mke2fs_shared_libraries)
 LOCAL_MODULE := mke2fs
-LOCAL_MODULE_TAGS := $(use_e2fsprog_module_tags)
+LOCAL_MODULE_TAGS := optional
 include $(BUILD_EXECUTABLE)
 
 include $(CLEAR_VARS)
@@ -75,7 +75,7 @@
 LOCAL_SHARED_LIBRARIES := $(mke2fs_shared_libraries)
 LOCAL_MODULE := mke2fs_host
 LOCAL_MODULE_STEM := mke2fs
-LOCAL_MODULE_TAGS := $(use_e2fsprog_module_tags)
+LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_HOST_EXECUTABLE)
 
@@ -136,7 +136,7 @@
 LOCAL_SHARED_LIBRARIES := $(tune2fs_shared_libraries)
 LOCAL_SYSTEM_SHARED_LIBRARIES := $(tune2fs_system_shared_libraries)
 LOCAL_MODULE := tune2fs
-LOCAL_MODULE_TAGS := $(use_e2fsprog_module_tags)
+LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_EXECUTABLE)
 
@@ -148,7 +148,7 @@
 LOCAL_SHARED_LIBRARIES := $(tune2fs_shared_libraries)
 LOCAL_MODULE := tune2fs_host
 LOCAL_MODULE_STEM := tune2fs
-LOCAL_MODULE_TAGS := $(use_e2fsprog_module_tags)
+LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_HOST_EXECUTABLE)
 
@@ -207,7 +207,7 @@
 LOCAL_SHARED_LIBRARIES := $(badblocks_shared_libraries)
 LOCAL_SYSTEM_SHARED_LIBRARIES := $(badblocks_system_shared_libraries)
 LOCAL_MODULE := badblocks
-LOCAL_MODULE_TAGS := $(use_e2fsprog_module_tags)
+LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_EXECUTABLE)
 
@@ -219,6 +219,6 @@
 LOCAL_SHARED_LIBRARIES := $(badblocks_shared_libraries)
 LOCAL_MODULE := badblocks_host
 LOCAL_MODULE_STEM := badblocks
-LOCAL_MODULE_TAGS := $(use_e2fsprog_module_tags)
+LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_HOST_EXECUTABLE)
diff --git a/resize/Android.mk b/resize/Android.mk
index b9b4f67..41d90e5 100644
--- a/resize/Android.mk
+++ b/resize/Android.mk
@@ -51,7 +51,7 @@
 LOCAL_SHARED_LIBRARIES := $(resize2fs_shared_libraries)
 LOCAL_SYSTEM_SHARED_LIBRARIES := $(resize2fs_system_shared_libraries)
 LOCAL_MODULE := resize2fs
-LOCAL_MODULE_TAGS := $(use_e2fsprog_module_tags)
+LOCAL_MODULE_TAGS := optional
 include $(BUILD_EXECUTABLE)
 
 include $(CLEAR_VARS)
@@ -62,6 +62,6 @@
 LOCAL_SHARED_LIBRARIES := $(resize2fs_shared_libraries)
 LOCAL_MODULE := resize2fs_host
 LOCAL_MODULE_STEM := resize2fs
-LOCAL_MODULE_TAGS := $(use_e2fsprog_module_tags)
+LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_HOST_EXECUTABLE)