Remove code that was unintentionally kept in a resynchronized patch in FS#3001. This...