Only add spaces automatically when appropriate.

Bug: 7164981
Change-Id: Id672104a0fda99c52923913fb0e40c3a1ead4787
Revert "Only add spaces automatically when appropriate."

This reverts commit 865fc6c4ef32fe81093ca743325cd497199d4d0a