This change produces analyze errors, and it changes the behavior of the code. Reverting