Reverting back the modifications for Xarg