Revert changes for TRQ-1810.