Oops, forgot a fix needed after the rebase.