Why this change? It seems it's causing test failures.