Revert "Fix TC-1767"