Why this change? Feels unrelated to the new feature...