Reverted changes in ExchangeClient