Revert "Merge commit 'ffe657b1c2c9089bda46b6167237474fb9170ac7' into properties"

This reverts commit 2fd098acfad331a914e1a43c3f12c428136c24a1, reversing
changes made to ecf76621849dab0a5ea39eddba306b5af930e61e.