Revert unneeded change which harms syntactic parsing. This fixes bug #23308.