Revert "base: fix public api breakage"

This reverts commit 3dc7eb0bdd9a535d2eb6dccda28bb9b70c1a5051.