Revert "Handle quoted properties better. Fixes issue 1173"

This reverts commit 16f7df6d709bab93c3beedf6e27dd5c4dd10fe21.