diff --git a/hw/xnest/GCOps.c b/hw/xnest/GCOps.c
index f2ef1d583..43a422e76 100644
--- a/hw/xnest/GCOps.c
+++ b/hw/xnest/GCOps.c
@@ -376,16 +376,26 @@ void
 xnestImageText8(DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count,
                 char *string)
 {
-    XDrawImageString(xnestDisplay, xnestDrawable(pDrawable), xnestGC(pGC),
-                     x, y, string, count);
+    xcb_image_text_8(xnestUpstreamInfo.conn,
+                     count,
+                     xnestDrawable(pDrawable),
+                     xnest_upstream_gc(pGC),
+                     x,
+                     y,
+                     string);
 }
 
 void
 xnestImageText16(DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count,
                  unsigned short *string)
 {
-    XDrawImageString16(xnestDisplay, xnestDrawable(pDrawable), xnestGC(pGC),
-                       x, y, (XChar2b *) string, count);
+    xcb_image_text_16(xnestUpstreamInfo.conn,
+                      count,
+                      xnestDrawable(pDrawable),
+                      xnest_upstream_gc(pGC),
+                      x,
+                      y,
+                      (xcb_char2b_t*)string);
 }
 
 void