Revert "These functions don't all need to be public"

This reverts commit 697593a6b9544cdca310cf48cd8c9bb871ad1725.