undo PacketFactory fix, fix CanaryVehicle