This change conflicts with #2660.