This was accidentally included after discussion in #21391 had decided to leave it out. It was never included in a release. Issue: #21391