Changing the API back as odino suggested

(I made a mess with merge/revert)