Revert "updating the PropHandling"

This reverts commit 4987e0416e0373ae206d268785e22a77b8e90223.