Merge pull request #11751 from tiborvass/revert-validate-spaces

Revert "Dealing with trailing whitespaces"