Revert NEMO-2175 changes to follow new implementation (with same end result)