Reverts unecessary visibility changes for master branch

Rollback for commit c4086d8f3b21d1805c1a28132b0a7256c8ff95ab.