NEMO-1838: Revert previous two commits. Will remove TODO UPGRADE later.