OBMFULL-5922 revert OBMFULL-4703 ( CR-2854 and CR-2870)