Reinstate r25260 with fix (missing trim()). No additional parser tests are broken...