TS-2107 Revert this change, please review for correctness