Reverted cleanup of properties