Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r0276993257b238c4056da818d241205ae0c30a56 -r2dd5f57796fa2b5412a1797d3d42bbf8ba11da7d
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 0276993257b238c4056da818d241205ae0c30a56)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 2dd5f57796fa2b5412a1797d3d42bbf8ba11da7d)
@@ -128,7 +128,6 @@
     { MSG_ID_DD_PRESSURE_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                  &testDDPressureSensorDataPublishIntervalOverride },
     { MSG_ID_DD_PRESSURE_SENSOR_FILTER_READINGS_OVERRIDE_REQUEST,                   &testDDPressureSensorFilteredReadingsOverride },
     { MSG_ID_DD_PRESSURE_SENSOR_FILTER_TEMPERATURE_OVERRIDE_REQUEST,                &testDDPressureSensorFilteredTemperatureReadingsOverride },
-#ifndef __TEENSY_CONDUCTIVITY_DRIVER__
     { MSG_ID_DD_CONDUCTIVITY_SENSOR_READINGS_OVERRIDE_REQUEST,                      &testDDConductivitySensorReadingsOverride },
     { MSG_ID_DD_CONDUCTIVITY_SENSOR_TEMPERATURE_OVERRIDE_REQUEST,                   &testDDConductivitySensorTemperatureReadingsOverride },
     { MSG_ID_DD_CONDUCTIVITY_SENSOR_READ_COUNTER_OVERRIDE_REQUEST,                  &testDDConductivitySensorReadCounterOverride },
@@ -139,7 +138,6 @@
     { MSG_ID_FP_CONDUCTIVITY_TEMP_OVERRIDE_REQUEST,                                 &testFPConductivitySensorTemperatureReadingsOverride },
     { MSG_ID_FP_CONDUCTIVITY_READ_COUNT_OVERRIDE_REQUEST,                           &testFPConductivitySensorReadCounterOverride },
     { MSG_ID_FP_CONDUCTIVITY_ERROR_COUNT_OVERRIDE_REQUEST,                          &testFPConductivitySensorErrorCounterOverride },
-#endif
     { MSG_ID_DD_CONCENTRATE_PUMP_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                 &testConcentratePumpDataPublishIntervalOverride },
     { MSG_ID_DD_CONCENTRATE_PUMP_TARGET_SPEED_OVERRIDE_REQUEST,                     &testConcentratePumpTargetSpeedOverride },
     { MSG_ID_DD_CONCENTRATE_PUMP_MEASURED_SPEED_OVERRIDE_REQUEST,                   &testConcentratePumpMeasuredSpeedOverride },