References #1754: Fixed issues where property values don't get cleaned up when disabling proxies