[PATCH 2/3] Fix old cross-bootstrap test