Closes #25130.
I've very much not satisfied with the word-smithing. To be honest, I'm not fully sure what's going on. @simonpj let me know what you think.