diff --git a/src/effects/Effect.cpp b/src/effects/Effect.cpp
index 688165080968..80f3f75a2d8f 100644
--- a/src/effects/Effect.cpp
+++ b/src/effects/Effect.cpp
@@ -129,14 +129,14 @@ bool Effect::SupportsAutomation() const
    return true;
 }
 
-std::shared_ptr<EffectInstance> StatefulEffect::MakeInstance() const
-{
-   // Cheat with const-cast to return an object that calls through to
-   // non-const methods of a stateful effect.
-   // Stateless effects should override this function and be really const
-   // correct.
-   return std::make_shared<Instance>(const_cast<StatefulEffect&>(*this));
-}
+// std::shared_ptr<EffectInstance> StatefulEffect::MakeInstance() const
+// {
+//    // Cheat with const-cast to return an object that calls through to
+//    // non-const methods of a stateful effect.
+//    // Stateless effects should override this function and be really const
+//    // correct.
+//    return std::make_shared<Instance>(const_cast<StatefulEffect&>(*this));
+// }
 
 const EffectParameterMethods &Effect::Parameters() const
 {
diff --git a/src/effects/Effect.h b/src/effects/Effect.h
index d8401d17627e..5cd587623364 100644
--- a/src/effects/Effect.h
+++ b/src/effects/Effect.h
@@ -361,7 +361,13 @@ class StatefulEffect
       SampleCount GetLatency(
          const EffectSettings &settings, double sampleRate) const override;
    };
-   std::shared_ptr<EffectInstance> MakeInstance() const override;
+   std::shared_ptr<EffectInstance> MakeInstance() const override {
+      // Cheat with const-cast to return an object that calls through to
+      // non-const methods of a stateful effect.
+      // Stateless effects should override this function and be really const
+      // correct.
+      return std::make_shared<Instance>(const_cast<StatefulEffect&>(*this));
+   };
 };
 
 // FIXME: