Remove ThreadWatcher conversion from old format.