Revert "Revert "base: fix public api breakage""

This reverts commit 162ff213e63c870734318b3059353ee006bcb749.