Revert "Merge pull request #3282 from colemanw/memberVisibility"

This reverts commit ce68481190840ee772e92eb1b16561abfaaedd32, reversing
changes made to 189c9c560d9f67961fc3756333c06fa520d93fec.
Merge pull request #3307 from kurund/membership-fix

Revert "Merge pull request #3282 from colemanw/memberVisibility"