Return new state instead of old one to maintain immutability.

Return new state instead of old one to maintain immutability. #123056