Oops! This was erroneously left out commit #16632.