Is it worth updating the comment to make it clear what is returned now?