Revert "Port all remaining self.protected_instance_variables to class methods"

This reverts commit 7de994fa215e9f4c2856d85034bc4dd7b65d0c01.
Return to using protected_instance_variables in AV