Backporting #2952, which I committed to master instead of 2.3