Revert "options: add --sub-visibility=<primary-only|secondary-only>"

This reverts commit 04f0b0abe48d664aaa1400d1dddb02b434999b85.

It's not a good idea to unify the names only for visibility, while
keeping secondary-* for everything else.

This needs a bit more thought before we allow secondary sub to be
visible on its own.