This is for ticket #23009. Remove statement about grammar too. No CHANGES entry done. Note that commit 176b2c47db wouldn't cherry-pick cleanly due to changes on nearby lines.
176b2c47db