Revert "Visibility Rules + Rollback2"

This reverts commit 860cd806d23a95de3fd387e6e84f16c347af90e7.