Reverting changes from earlier today Case#5606790593221