Reverting changes #3266