We start breaking the API, too

Signed-off-by: Luca Fulchir <luker@fenrirproject.org>