diff --git a/client.cpp b/client.cpp
index 13062a7e8d..3bef84affe 100644
--- a/client.cpp
+++ b/client.cpp
@@ -2277,7 +2277,7 @@ void Client::updateCompositeBlocking(bool readProperty)
 {
     if (readProperty) {
         const unsigned long properties[2] = {0, NET::WM2BlockCompositing};
-        NETWinInfo2 i(display(), window(), rootWindow(), properties, 2);
+        NETWinInfo i(connection(), window(), rootWindow(), properties, 2);
         setBlockingCompositing(i.isBlockingCompositing());
     }
     else
diff --git a/composite.cpp b/composite.cpp
index 6c5f15d6b3..eb2b828f3f 100644
--- a/composite.cpp
+++ b/composite.cpp
@@ -301,7 +301,7 @@ void Compositor::finish()
             ++it) {
         // forward all opacity values to the frame in case there'll be other CM running
         if ((*it)->opacity() != 1.0) {
-            NETWinInfo2 i(display(), (*it)->frameId(), rootWindow(), 0);
+            NETWinInfo i(connection(), (*it)->frameId(), rootWindow(), 0);
             i.setOpacity(static_cast< unsigned long >((*it)->opacity() * 0xffffffff));
         }
     }
diff --git a/events.cpp b/events.cpp
index 5056c9af80..b402fee644 100644
--- a/events.cpp
+++ b/events.cpp
@@ -510,7 +510,7 @@ bool Client::windowEvent(xcb_generic_event_t *e)
                 emit opacityChanged(this, old_opacity);
             } else {
                 // forward to the frame if there's possibly another compositing manager running
-                NETWinInfo2 i(display(), frameId(), rootWindow(), 0);
+                NETWinInfo i(connection(), frameId(), rootWindow(), 0);
                 i.setOpacity(info->opacity());
             }
         }
diff --git a/geometry.cpp b/geometry.cpp
index 4613a1a7ea..3e781f1b5a 100644
--- a/geometry.cpp
+++ b/geometry.cpp
@@ -816,7 +816,7 @@ void Workspace::setClientIsMoving(Client *c)
 // (the property with the size of the frame remains on the window after the crash).
 void Workspace::fixPositionAfterCrash(xcb_window_t w, const xcb_get_geometry_reply_t *geometry)
 {
-    NETWinInfo i(display(), w, rootWindow(), NET::WMFrameExtents);
+    NETWinInfo i(connection(), w, rootWindow(), NET::WMFrameExtents);
     NETStrut frame = i.frameExtents();
 
     if (frame.left != 0 || frame.top != 0) {
diff --git a/group.cpp b/group.cpp
index e17d9a579b..4534c37826 100644
--- a/group.cpp
+++ b/group.cpp
@@ -204,7 +204,7 @@ Group::Group(Window leader_P)
     if (leader_P != None) {
         leader_client = workspace()->findClient(WindowMatchPredicate(leader_P));
         unsigned long properties[ 2 ] = { 0, NET::WM2StartupId };
-        leader_info = new NETWinInfo2(display(), leader_P, rootWindow(),
+        leader_info = new NETWinInfo(connection(), leader_P, rootWindow(),
                                       properties, 2);
     }
     effect_group = new EffectWindowGroupImpl(this);
diff --git a/group.h b/group.h
index 5df70a63fe..e77707d72e 100644
--- a/group.h
+++ b/group.h
@@ -60,7 +60,7 @@ private:
     ClientList _members;
     Client* leader_client;
     Window leader_wid;
-    NETWinInfo2* leader_info;
+    NETWinInfo* leader_info;
     Time user_time;
     int refcount;
     EffectWindowGroupImpl* effect_group;
diff --git a/manage.cpp b/manage.cpp
index 9cbb47e1e2..5f38fe1982 100644
--- a/manage.cpp
+++ b/manage.cpp
@@ -100,7 +100,7 @@ bool Client::manage(xcb_window_t w, bool isMapped)
         NET::WM2FrameOverlap |
         0;
 
-    info = new WinInfo(this, display(), m_client, rootWindow(), properties, 2);
+    info = new WinInfo(this, m_client, rootWindow(), properties, 2);
 
     m_colormap = attr.colormap;
 
diff --git a/netinfo.cpp b/netinfo.cpp
index 331cfad730..a442304e85 100644
--- a/netinfo.cpp
+++ b/netinfo.cpp
@@ -249,9 +249,9 @@ void RootInfo::changeShowingDesktop(bool showing)
 // WinInfo
 // ****************************************
 
-WinInfo::WinInfo(Client * c, Display * display, Window window,
-                 Window rwin, const unsigned long pr[], int pr_size)
-    : NETWinInfo2(display, window, rwin, pr, pr_size, NET::WindowManager), m_client(c)
+WinInfo::WinInfo(Client * c, xcb_window_t window,
+                 xcb_window_t rwin, const unsigned long pr[], int pr_size)
+    : NETWinInfo(connection(), window, rwin, pr, pr_size, NET::WindowManager), m_client(c)
 {
 }
 
diff --git a/netinfo.h b/netinfo.h
index 6a66ffd964..0ce782d9c8 100644
--- a/netinfo.h
+++ b/netinfo.h
@@ -71,14 +71,14 @@ inline RootInfo *rootInfo()
 /**
  * NET WM Protocol handler class
  */
-class WinInfo : public NETWinInfo2
+class WinInfo : public NETWinInfo
 {
 private:
     typedef KWin::Client Client; // Because of NET::Client
 
 public:
-    WinInfo(Client* c, Display * display, Window window,
-            Window rwin, const unsigned long pr[], int pr_size);
+    WinInfo(Client* c, xcb_window_t window,
+            xcb_window_t rwin, const unsigned long pr[], int pr_size);
     virtual void changeDesktop(int desktop) override;
     virtual void changeFullscreenMonitors(NETFullscreenMonitors topology) override;
     virtual void changeState(unsigned long state, unsigned long mask) override;
diff --git a/toplevel.h b/toplevel.h
index 6e5650d127..08177f2022 100644
--- a/toplevel.h
+++ b/toplevel.h
@@ -380,7 +380,7 @@ protected:
     QRect geom;
     Visual* vis;
     int bit_depth;
-    NETWinInfo2* info;
+    NETWinInfo* info;
     bool ready_for_painting;
     QRegion repaints_region; // updating, repaint just requires repaint of that area
     QRegion layer_repaints_region;
diff --git a/unmanaged.cpp b/unmanaged.cpp
index e87cf5d32d..7b5437d815 100644
--- a/unmanaged.cpp
+++ b/unmanaged.cpp
@@ -71,7 +71,7 @@ bool Unmanaged::track(Window w)
     properties[ NETWinInfo::PROTOCOLS2 ] =
         NET::WM2Opacity |
         0;
-    info = new NETWinInfo2(display(), w, rootWindow(), properties, 2);
+    info = new NETWinInfo(connection(), w, rootWindow(), properties, 2);
     getResourceClass();
     getWindowRole();
     getWmClientLeader();