Revert "#1930 - Method of avoiding calling base64_* directly"

This reverts commit e418109c44066391c7611e82830e8c5356531957.