replace the cut down machtype with the full one, as we support a lot of not-yet-upstr...