Revert "Merge pull request #320 from G5/properties"

This reverts commit bfde87fcc2f97bd1379314c9a724df9eb3f7feb0, reversing
changes made to b844d9a027522c585091b2c6e6c60c089930a148.