1.7 Upgrade: undo_groupings() causes warnings (before groupings exist)

On a 1.7 upgrade:

1146: Table 'moodletest.groups_courses_groupings' doesn't exist

ADOConnection._Execute(
SELECT gpgs.courseid, ggs.groupid
FROM groups_courses_groupings gpgs,
..., false) % line 889, file: adodb.inc.php
ADOConnection.Execute(
SELECT gpgs.courseid, ggs.groupid
FROM groups_courses_groupings gpgs,
...) % line 674, file: dmllib.php
get_recordset_sql(
SELECT gpgs.courseid, ggs.groupid
FROM groups_courses_groupings gpgs,
...) % line 58, file: upgrade.php
undo_groupings() % line 679, file: upgrade.php
xmldb_main_upgrade(2006101010) % line 322, file: index.php

I assume this is again related to the various other bugs because of groups being seperated from the core upgrade