Revert "Revert back to current public API"

This reverts commit 573a11d554640480878ff1aa55a33ade9fcf8c9f.