CA-118781: revert init order changes