Reverting changes #2521