That's in #2450. I don't want to make that change here, because that could cause this PR to conflict with that one.