revert PLAT-599 changes