TS-2824: Revert TS-2592 (2fbd4b6)