     (assoc-in build [:build-options :devcards] true)
     build))
 
-(defn prep-build-for-figwheel-client
+(defn forward-to-figwheel-build-id
   "Given a build config that has a :figwheel config in it "
   [{:keys [id figwheel] :as build}]
-  (if figwheel
-    (assoc build :figwheel
-           (-> (if (map? figwheel) figwheel {})
-               (append-build-id id)
-               fix-symbol-vals))
+  (if (and figwheel id)
+    (update build :figwheel
+            (fn [x] (assoc (if (map? x) x {})
+                          :build-id id)))
     build))
 
 (defn figwheel-build? [{:keys [build-options] :as build}]


(defn update-figwheel-connect-options [figwheel-server build]
  (if (figwheel-build? build)
    (let [build (prep-build-for-figwheel-client build)]
      (if-not (get-in build [:figwheel :websocket-url]) ;; prefer 
        (let [host (or (get-in build [:figwheel :websocket-host]) "localhost")]
          (if-not (= :js-client-host host)
            (-> build
              (update-in [:figwheel] dissoc :websocket-host)
              (assoc-in [:figwheel :websocket-url]
                        (str "ws://" host ":" (:server-port figwheel-server) "/figwheel-ws")))
            (update-in build [:figwheel] dissoc :websocket-host)))
        build))
    build))


      (mkdirs output-to))
    build))

(defn optimizations-none?
  "Given a map of compiler options returns true if a build will be
  compiled in :optimizations :none mode"
  [{:keys [optimizations]}]
  (or (nil? optimizations) (= optimizations :none)))

(defn forward-devcard-option
  "Given a build-config has a [:figwheel :devcards] config it make
