revert f0db03d6e460f69a151fa5a9a9d5ee59a3480fe6, properties are still being used