Revert "Add visibility masks"

This reverts commit f17bb466692613372f9584fc4a65c17a99218be5.
