     :getDefaultProps
     (throw (js/Error. "getDefaultProps not supported"))
 
+    ;; In ES6 React, this is now part of the constructor
     :getInitialState
-    (fn getInitialState []
-      (this-as c (reset! (state-atom c) (.call f c c))))
+    (fn getInitialState [c]
+      (reset! (state-atom c) (.call f c c)))
 
     :componentWillReceiveProps
     (fn componentWillReceiveProps [nextprops]

(ns reagent.impl.component
  (:require [create-react-class :as create-react-class]
            [react :as react]
            [reagent.impl.util :as util]
            [reagent.impl.batching :as batch]

                        {} fmap)]
    (assoc fmap
           :displayName name
           :cljsLegacyRender legacy-render
           :reagentRender render-fun
           :render (:render static-fns))))
