diff --git a/src/main/osd_slave/osd_slave_init.c b/src/main/osd_slave/osd_slave_init.c
index 2a37ec4b42..9dede7ffd5 100644
--- a/src/main/osd_slave/osd_slave_init.c
+++ b/src/main/osd_slave/osd_slave_init.c
@@ -146,9 +146,6 @@ void init(void)
 
     debugMode = systemConfig()->debug_mode;
 
-    // Latch active features to be used for featureConfigured() in the remainder of init().
-    latchActiveFeatures();
-
 #ifdef TARGET_PREINIT
     targetPreInit();
 #endif
@@ -299,9 +296,6 @@ void init(void)
 
     batteryInit();
 
-    // Latch active features AGAIN since some may be modified by init().
-    latchActiveFeatures();
-
     fcTasksInit();
 
     systemState |= SYSTEM_STATE_READY;
diff --git a/src/test/unit/arming_prevention_unittest.cc b/src/test/unit/arming_prevention_unittest.cc
index 0fef4300d2..cae6678585 100644
--- a/src/test/unit/arming_prevention_unittest.cc
+++ b/src/test/unit/arming_prevention_unittest.cc
@@ -793,7 +793,7 @@ extern "C" {
     uint32_t millis(void) { return micros() / 1000; }
     bool rxIsReceivingSignal(void) { return simulationHaveRx; }
 
-    bool feature(uint32_t f) { return simulationFeatureFlags & f; }
+    bool featureConfigured(uint32_t f) { return simulationFeatureFlags & f; }
     void warningLedFlash(void) {}
     void warningLedDisable(void) {}
     void warningLedUpdate(void) {}
diff --git a/src/test/unit/battery_unittest.cc.txt b/src/test/unit/battery_unittest.cc.txt
index d3a8cb889d..6de02754ac 100644
--- a/src/test/unit/battery_unittest.cc.txt
+++ b/src/test/unit/battery_unittest.cc.txt
@@ -273,7 +273,7 @@ uint8_t armingFlags = 0;
 float rcCommand[4] = {0,0,0,0};
 
 
-bool feature(uint32_t mask)
+bool featureConfigured(uint32_t mask)
 {
     UNUSED(mask);
     return false;
diff --git a/src/test/unit/blackbox_unittest.cc b/src/test/unit/blackbox_unittest.cc
index 7716314916..51faa78f4f 100644
--- a/src/test/unit/blackbox_unittest.cc
+++ b/src/test/unit/blackbox_unittest.cc
@@ -388,7 +388,7 @@ bool sensors(uint32_t) {return false;}
 void serialWrite(serialPort_t *, uint8_t) {}
 uint32_t serialTxBytesFree(const serialPort_t *) {return 0;}
 bool isSerialTransmitBufferEmpty(const serialPort_t *) {return false;}
-bool feature(uint32_t) {return false;}
+bool featureConfigured(uint32_t) {return false;}
 void mspSerialReleasePortIfAllocated(serialPort_t *) {}
 serialPortConfig_t *findSerialPortConfig(serialPortFunction_e ) {return NULL;}
 serialPort_t *findSharedSerialPort(uint16_t , serialPortFunction_e ) {return NULL;}
diff --git a/src/test/unit/flight_failsafe_unittest.cc b/src/test/unit/flight_failsafe_unittest.cc
index 4fe3e4aeae..33b6150277 100644
--- a/src/test/unit/flight_failsafe_unittest.cc
+++ b/src/test/unit/flight_failsafe_unittest.cc
@@ -567,7 +567,7 @@ throttleStatus_e calculateThrottleStatus()
 
 void delay(uint32_t) {}
 
-bool feature(uint32_t mask) {
+bool featureConfigured(uint32_t mask) {
     return (mask & testFeatureMask);
 }
 
diff --git a/src/test/unit/flight_mixer_unittest.cc.txt b/src/test/unit/flight_mixer_unittest.cc.txt
index 8a30af72fd..59bf807309 100644
--- a/src/test/unit/flight_mixer_unittest.cc.txt
+++ b/src/test/unit/flight_mixer_unittest.cc.txt
@@ -392,7 +392,7 @@ uint8_t armingFlags;
 
 void delay(uint32_t) {}
 
-bool feature(uint32_t mask) {
+bool featureConfigured(uint32_t mask) {
     return (mask & testFeatureMask);
 }
 
diff --git a/src/test/unit/ledstrip_unittest.cc b/src/test/unit/ledstrip_unittest.cc
index 0d6b8256a9..f2e9e83ae1 100644
--- a/src/test/unit/ledstrip_unittest.cc
+++ b/src/test/unit/ledstrip_unittest.cc
@@ -352,7 +352,7 @@ void delay(uint32_t ms)
 
 uint32_t micros(void) { return 0; }
 bool shouldSoundBatteryAlarm(void) { return false; }
-bool feature(uint32_t mask) {
+bool featureConfigured(uint32_t mask) {
     UNUSED(mask);
     return false;
 }
diff --git a/src/test/unit/rc_controls_unittest.cc b/src/test/unit/rc_controls_unittest.cc
index d8b67449b5..2ba60c86ed 100644
--- a/src/test/unit/rc_controls_unittest.cc
+++ b/src/test/unit/rc_controls_unittest.cc
@@ -709,7 +709,7 @@ void gyroStartCalibration(bool isFirstArmingCalibration)
 }
 void applyAndSaveAccelerometerTrimsDelta(rollAndPitchTrims_t*) {}
 void handleInflightCalibrationStickPosition(void) {}
-bool feature(uint32_t) { return false;}
+bool featureConfigured(uint32_t) { return false;}
 bool sensors(uint32_t) { return false;}
 void tryArm(void) {}
 void disarm(void) {}
diff --git a/src/test/unit/rcdevice_unittest.cc b/src/test/unit/rcdevice_unittest.cc
index a255e4d830..5e441c31c6 100644
--- a/src/test/unit/rcdevice_unittest.cc
+++ b/src/test/unit/rcdevice_unittest.cc
@@ -845,7 +845,7 @@ extern "C" {
         sbufWriteU8(dst, (uint8_t)val);
     }
 
-    bool feature(uint32_t) { return false; }
+    bool featureConfigured(uint32_t) { return false; }
 
     void serialWriteBuf(serialPort_t *instance, const uint8_t *data, int count) 
     { 
diff --git a/src/test/unit/rx_ranges_unittest.cc b/src/test/unit/rx_ranges_unittest.cc
index d45f0490ac..0bcdfcff2a 100644
--- a/src/test/unit/rx_ranges_unittest.cc
+++ b/src/test/unit/rx_ranges_unittest.cc
@@ -186,7 +186,7 @@ bool rxMspInit(rxConfig_t *rxConfig, rxRuntimeConfig_t *rxRuntimeConfig, rcReadR
     return true;
 }
 
-bool feature(uint32_t) {
+bool featureConfigured(uint32_t) {
     return false;
 }
 
diff --git a/src/test/unit/telemetry_crsf_msp_unittest.cc b/src/test/unit/telemetry_crsf_msp_unittest.cc
index 51a5fbeb36..7e503c2efd 100644
--- a/src/test/unit/telemetry_crsf_msp_unittest.cc
+++ b/src/test/unit/telemetry_crsf_msp_unittest.cc
@@ -272,7 +272,7 @@ extern "C" {
     	return 0;
     }
 
-    bool feature(uint32_t) {return false;}
+    bool featureConfigured(uint32_t) {return false;}
 
     bool isAirmodeActive(void) {return true;}
 
diff --git a/src/test/unit/telemetry_crsf_unittest.cc b/src/test/unit/telemetry_crsf_unittest.cc
index ed0a29a642..4b82794043 100644
--- a/src/test/unit/telemetry_crsf_unittest.cc
+++ b/src/test/unit/telemetry_crsf_unittest.cc
@@ -293,7 +293,7 @@ void beeperConfirmationBeeps(uint8_t beepCount) {UNUSED(beepCount);}
 
 uint32_t micros(void) {return 0;}
 
-bool feature(uint32_t) {return true;}
+bool featureConfigured(uint32_t) {return true;}
 
 uint32_t serialRxBytesWaiting(const serialPort_t *) {return 0;}
 uint32_t serialTxBytesFree(const serialPort_t *) {return 0;}
diff --git a/src/test/unit/telemetry_ibus_unittest.cc b/src/test/unit/telemetry_ibus_unittest.cc
index e1c093b0c5..add04497cb 100644
--- a/src/test/unit/telemetry_ibus_unittest.cc
+++ b/src/test/unit/telemetry_ibus_unittest.cc
@@ -108,7 +108,7 @@ throttleStatus_e calculateThrottleStatus(void)
     return throttleStatus;
 }
 
-bool feature(uint32_t mask)
+bool featureConfigured(uint32_t mask)
 {
     return (definedFeatures & mask) != 0;
 }