This line has nothing to do with the issue I guess. What is the background of this change? Do we want to create a separate ticket for this?