This reverts commit 9ffad8eb.
It was actually added rather recently in 8e8afa82 due to a crash
that would otherwise happen in the RTSP code. As I don't think we've
fixed that behavior yet, we better keep this work-around until we have
fixed it better.
