Reverting back to origin xd-shell [XD-2072]