moved to bundled serialization as this is much faster