Revert "Adjustment to how objects variables are accessed"

This reverts commit 9c7342b93e68fb0390979e9099babb8a014a7351.
Adjust variable accessing for method matching