QAART-447 CR Fix: Undoing the remove upon request
QAART-447 CR Fixes: Addressing the comments