Rollback of some changes.
Updates to visibility of methods.