Revert "fixed some Properties bugs"

This reverts commit b264b1564a008bc84e138b272a9aacbacdd45e5a.