Just noting that this is another place that reverts the upstream change.