Rewrite client code with local bundled version