Reverting changes #3573