Revert "Merge "Do not allow new additions to core_property_type" am: d57dd813 am: f13dcbb4 am: 5bfa8509 am: 47e2f081"

This reverts commit 635d206b.

Change-Id: I1f937794162b563a24bbc4f4c83a24be93812a54