Revert property change fix

This reverts commit d9ece12977eb157cc0b08363cd2dfec7c4b32d6a. It also causes a lot of test failures in Montage and FRB to be resolved.