Revert "Fixed visibility of two classes and a variable."

This reverts commit b51fdf8d0967cf26e981ccab383882ab9d9d69a9.