Revert "Bug-2827: role switch proposal"