diff --git a/twinstall.cpp b/twinstall.cpp
index 70eb7ef..b0b6f3d 100644
--- a/twinstall.cpp
+++ b/twinstall.cpp
@@ -60,7 +60,6 @@
 }
 
 #define AB_OTA "payload_properties.txt"
-//#define TW_NO_LEGACY_PROPS 1
 
 static const char* properties_path = "/dev/__properties__";
 static const char* properties_path_renamed = "/dev/__properties_kk__";
@@ -174,11 +173,13 @@
 	FILE* child_data;
 
 #ifndef TW_NO_LEGACY_PROPS
-	/* Set legacy properties */
-	if (switch_to_legacy_properties() != 0) {
-		LOGERR("Legacy property environment did not initialize successfully. Properties may not be detected.\n");
-	} else {
-		LOGINFO("Legacy property environment initialized.\n");
+	if (DataManager::GetIntValue("tw_enable_legacy_props") != 0) {
+		/* Set legacy properties */
+		if (switch_to_legacy_properties() != 0) {
+			LOGERR("Legacy property environment did not initialize successfully. Properties may not be detected.\n");
+		} else {
+			LOGINFO("Legacy property environment initialized.\n");
+		}
 	}
 #endif
 
@@ -259,12 +260,14 @@
 	int waitrc = TWFunc::Wait_For_Child(pid, &status, "Updater");
 
 #ifndef TW_NO_LEGACY_PROPS
-	/* Unset legacy properties */
-	if (legacy_props_path_modified) {
-		if (switch_to_new_properties() != 0) {
-			LOGERR("Legacy property environment did not disable successfully. Legacy properties may still be in use.\n");
-		} else {
-			LOGINFO("Legacy property environment disabled.\n");
+	if (DataManager::GetIntValue("tw_enable_legacy_props") != 0) {
+		/* Unset legacy properties */
+		if (legacy_props_path_modified) {
+			if (switch_to_new_properties() != 0) {
+				LOGERR("Legacy property environment did not disable successfully. Legacy properties may still be in use.\n");
+			} else {
+				LOGINFO("Legacy property environment disabled.\n");
+			}
 		}
 	}
 #endif