why this change? /cc @abenari