Add back a return that got lost in rebase