We did this in #6761.