diff --git a/HISTORY b/HISTORY
index 7c3f7017..3378b1ad 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2667,6 +2667,11 @@ Video Disk Recorder Revision History
   now initiates an "emergency exit" if the number of UPT errors during one
   recording exceeds 10 (suggested by Gregoire Favre). Since the UPT error doesn't
   happen on my system, this has not been explicitly tested.
+  The "preliminary fix" for the UPT error in VDR/dvbdevice.c has been disabled
+  by default, since it makes channel switching unpleasently slow. If you want
+  to have that workaround back, you can uncomment the line
+  //#define WAIT_FOR_LOCK_AFTER_TUNING 1
+  in VDR/dvbdevice.c.
 - Adapted the 'sky' plugin to use the actual channel IDs, and to fetch EPG data
   from www.bleb.org.
 - Limited automatic retuning to devices that actually provide the transponder
diff --git a/dvbdevice.c b/dvbdevice.c
index e1d5fc63..8ed62e1f 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.81 2004/02/08 14:07:07 kls Exp $
+ * $Id: dvbdevice.c 1.82 2004/02/24 10:12:13 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -35,6 +35,7 @@ extern "C" {
 
 #define DO_REC_AND_PLAY_ON_PRIMARY_DEVICE 1
 #define DO_MULTIPLE_RECORDINGS 1
+//#define WAIT_FOR_LOCK_AFTER_TUNING 1
 
 #define DEV_VIDEO         "/dev/video"
 #define DEV_DVB_ADAPTER   "/dev/dvb/adapter"
@@ -751,11 +752,12 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
 
   dvbTuner->Set(Channel, DoTune, !EITScanner.UsesDevice(this)); //XXX 1.3: this is an ugly hack - find a cleaner solution//XXX
 
+#ifdef WAIT_FOR_LOCK_AFTER_TUNING
   //XXX TODO preliminary fix for the "Unknown picture type" error
   time_t t0 = time(NULL);
   while (!dvbTuner->Locked() && time(NULL) - t0 < 5)
         usleep(100);
-  //XXX
+#endif
   // PID settings:
 
   if (TurnOnLivePIDs) {