This line (936) is the important change.