Revert TESB-11966