diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp
index 40921ea..a7d9b67 100644
--- a/src/gpu/GrContext.cpp
+++ b/src/gpu/GrContext.cpp
@@ -1586,7 +1586,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 void GrContext::setPaint(const GrPaint& paint) {
-    GrAssert(fDrawState->stagesDisabled());
+    // TODO: reenable this once we've cleaned up text state management
+    //GrAssert(fDrawState->stagesDisabled());
 
     for (int i = 0; i < GrPaint::kMaxTextures; ++i) {
         int s = i + GrPaint::kFirstTextureStage;