Why do you need this change? Can you add a test to showcase the desired behavior?

@mariash @ryantang