am 8f731bb2: am 0545c916: Revert "Allow properties with spaces in their values"

Merge commit '8f731bb2720475f652cc8c5849d564246b234bef'

* commit '8f731bb2720475f652cc8c5849d564246b234bef':
  Revert "Allow properties with spaces in their values"