Alexandre, please comment if you think this should go in another helper, so that we don't mix the old and the new API.