diff -r f92a4f87e424 -r 012cc2ee6408 usbmgmt/usbmgr/usbman/chargingplugin/src/vbuswatcher.cpp
--- a/usbmgmt/usbmgr/usbman/chargingplugin/src/vbuswatcher.cpp	Tue Aug 31 17:01:47 2010 +0300
+++ b/usbmgmt/usbmgr/usbman/chargingplugin/src/vbuswatcher.cpp	Wed Sep 01 12:35:00 2010 +0100
@@ -48,13 +48,7 @@
 
 void CVBusWatcher::ConstructL()
 	{
-#ifdef __CHARGING_PLUGIN_TEST_CODE__
-    const TInt8 KPropertyOffsetForChargingTest = 100;
-    User::LeaveIfError(iVBusProp.Attach(KUidUsbManCategory, KUsbOtgVBusPoweredProperty + KPropertyOffsetForChargingTest));
-#else
-    User::LeaveIfError(iVBusProp.Attach(KUidUsbManCategory, KUsbOtgVBusPoweredProperty));
-#endif
-
+	User::LeaveIfError(iVBusProp.Attach(KUidUsbManCategory, KUsbOtgVBusPoweredProperty));
 	iVBusProp.Subscribe(iStatus);
 	SetActive();