diff --git a/src/plugins/platforms/wayland/qwaylandabstractdecoration.cpp b/src/plugins/platforms/wayland/qwaylandabstractdecoration.cpp
index e247dbbad4f..e4b81bb8363 100644
--- a/src/plugins/platforms/wayland/qwaylandabstractdecoration.cpp
+++ b/src/plugins/platforms/wayland/qwaylandabstractdecoration.cpp
@@ -80,7 +80,6 @@ QWaylandAbstractDecorationPrivate::QWaylandAbstractDecorationPrivate()
 
 QWaylandAbstractDecorationPrivate::~QWaylandAbstractDecorationPrivate()
 {
-    m_wayland_window->setDecoration(0);
 }
 
 QWaylandAbstractDecoration::QWaylandAbstractDecoration()
@@ -103,7 +102,6 @@ void QWaylandAbstractDecoration::setWaylandWindow(QWaylandWindow *window)
 
     d->m_window = window->window();
     d->m_wayland_window = window;
-    d->m_wayland_window->setDecoration(this);
 }
 
 const QImage &QWaylandAbstractDecoration::contentImage()
diff --git a/src/plugins/platforms/wayland/qwaylandwindow.cpp b/src/plugins/platforms/wayland/qwaylandwindow.cpp
index 2fc904aadd1..3b1de7f60c3 100644
--- a/src/plugins/platforms/wayland/qwaylandwindow.cpp
+++ b/src/plugins/platforms/wayland/qwaylandwindow.cpp
@@ -535,6 +535,9 @@ bool QWaylandWindow::createDecoration()
                 return false;
             }
             mWindowDecoration->setWaylandWindow(this);
+            if (subSurfaceWindow()) {
+                subSurfaceWindow()->adjustPositionOfChildren();
+            }
         }
     } else {
         delete mWindowDecoration;
@@ -549,15 +552,6 @@ QWaylandAbstractDecoration *QWaylandWindow::decoration() const
     return mWindowDecoration;
 }
 
-// ### can't this go away? we directly set up our decorations, after all
-void QWaylandWindow::setDecoration(QWaylandAbstractDecoration *decoration)
-{
-    mWindowDecoration = decoration;
-    if (subSurfaceWindow()) {
-        subSurfaceWindow()->adjustPositionOfChildren();
-    }
-}
-
 static QWindow *topLevelWindow(QWindow *window)
 {
     while (QWindow *parent = window->parent())
diff --git a/src/plugins/platforms/wayland/qwaylandwindow_p.h b/src/plugins/platforms/wayland/qwaylandwindow_p.h
index c2df0937cd1..6c32bc3ef2f 100644
--- a/src/plugins/platforms/wayland/qwaylandwindow_p.h
+++ b/src/plugins/platforms/wayland/qwaylandwindow_p.h
@@ -145,8 +145,6 @@ public:
     void unfocus();
 
     QWaylandAbstractDecoration *decoration() const;
-    void setDecoration(QWaylandAbstractDecoration *decoration);
-
 
     void handleMouse(QWaylandInputDevice *inputDevice,
                      ulong timestamp,