ADEN-1412 Revert some changes