Revert INST-74 [RTFACT-20622]