Applying hotfix - public properties that are unset also cause __unset calls