I created HHH-12034 to handled Gai's finding which applied to property-based access as well. Even if we reverted this PR, we would still have the issue reported by Gail.