Revert "marking as package local"

This reverts commit d1580e6610d77bfeb813bd0df7613207f1e6c8d1.

Some clients were still referring to this class.