Merge: #24903: Remove misleading error message to fix regression.