In fact - don't bother removing it.  I'm about to send you a patch with a load of fixes and I've already nuked this.