Revert^2 "Organize citadel's setting" 0ed91028402fc1e0bdc179cbd01f2745cc92fa7c Change-Id: Iaa636e81032c04dadf35cbd907a7eb16de6d991a