I have another full-rebuild commit in the pipeline (bzip2 currently
keeps a reference to the Mes toolchain), so we might as well fix it
properly.

Waiting for confirmation from Timothy as to what the proper fix is,
though.