Add back xpi (fix merge)