Tesesa's patch for scan.py before-removing-taurus