diff --git a/src/com/android/launcher2/Utilities.java b/src/com/android/launcher2/Utilities.java
index 50757ca..ec9fb79 100644
--- a/src/com/android/launcher2/Utilities.java
+++ b/src/com/android/launcher2/Utilities.java
@@ -43,6 +43,8 @@
 final class Utilities {
     private static final String TAG = "Launcher.Utilities";
 
+    private static final boolean TEXT_BURN = false;
+
     private static int sIconWidth = -1;
     private static int sIconHeight = -1;
     private static int sIconTextureWidth = -1;
@@ -379,7 +381,9 @@
             textPaint.setTextSize(13*scale);
             textPaint.setColor(0xffffffff);
             textPaint.setAntiAlias(true);
-            //textPaint.setShadowLayer(8, 0, 0, 0xff000000);
+            if (TEXT_BURN) {
+                textPaint.setShadowLayer(8, 0, 0, 0xff000000);
+            }
 
             float ascent = -textPaint.ascent();
             float descent = textPaint.descent();
@@ -407,7 +411,7 @@
             if (lineCount > MAX_LINES) {
                 lineCount = MAX_LINES;
             }
-            if (lineCount > 0) {
+            if (!TEXT_BURN && lineCount > 0) {
                 RectF bubbleRect = mBubbleRect;
                 bubbleRect.bottom = height(lineCount);
                 c.drawRoundRect(bubbleRect, mCornerRadius, mCornerRadius, mRectPaint);
