Revert "Replaced direct access to protected class variable with setter call"

This reverts commit 1434adf6152258ab91f6145b8b8d4481fb3ed962.