revert TIFPSI-87