diff --git a/src/menu/menu.c b/src/menu/menu.c
index 5f814077..50bc9724 100644
--- a/src/menu/menu.c
+++ b/src/menu/menu.c
@@ -75,17 +75,6 @@ menu_get_by_id(const char *id)
 	return NULL;
 }
 
-static struct wlr_scene_node *
-create_scaling_buffer(struct wlr_scene_node *parent, struct wlr_buffer *buffer)
-{
-	struct wlr_scene_buffer *scene_buffer =
-		wlr_scene_buffer_create(parent, buffer);
-	/* Make sure output scaling works correctly */
-	struct wlr_fbox source_box = { 0, 0, buffer->width, buffer->height };
-	wlr_scene_buffer_set_source_box(scene_buffer, &source_box);
-	return &scene_buffer->node;
-}
-
 static struct menuitem *
 item_create(struct menu *menu, const char *text)
 {
@@ -137,10 +126,10 @@ item_create(struct menu *menu, const char *text)
 		theme->menu_items_active_bg_color)->node;
 
 	/* Font nodes */
-	menuitem->normal.text = create_scaling_buffer(
-		menuitem->normal.background, &menuitem->normal.buffer->base);
-	menuitem->selected.text = create_scaling_buffer(
-		menuitem->selected.background, &menuitem->selected.buffer->base);
+	menuitem->normal.text = &wlr_scene_buffer_create(
+		menuitem->normal.background, &menuitem->normal.buffer->base)->node;
+	menuitem->selected.text = &wlr_scene_buffer_create(
+		menuitem->selected.background, &menuitem->selected.buffer->base)->node;
 
 	/* Node descriptors for top scene nodes of menuitem */
 	node_descriptor_create(menuitem->normal.background,
diff --git a/src/ssd/ssd_part.c b/src/ssd/ssd_part.c
index fa8b6ac1..ec754697 100644
--- a/src/ssd/ssd_part.c
+++ b/src/ssd/ssd_part.c
@@ -40,11 +40,7 @@ add_scene_buffer(struct wl_list *list, enum ssd_part_type type,
 	int x, int y)
 {
 	struct ssd_part *part = add_scene_part(list, type);
-	struct wlr_scene_buffer *scene_buffer =
-		wlr_scene_buffer_create(parent, buffer);
-	part->node = &scene_buffer->node;
-	struct wlr_fbox source_box = { 0, 0, buffer->width, buffer->height };
-	wlr_scene_buffer_set_source_box(scene_buffer, &source_box);
+	part->node = &wlr_scene_buffer_create(parent, buffer)->node;
 	wlr_scene_node_set_position(part->node, x, y);
 	return part;
 }
diff --git a/src/ssd/ssd_titlebar.c b/src/ssd/ssd_titlebar.c
index 4183e9a1..7a80a0a7 100644
--- a/src/ssd/ssd_titlebar.c
+++ b/src/ssd/ssd_titlebar.c
@@ -221,7 +221,6 @@ ssd_update_title(struct view *view)
 	struct ssd_part *parent_part;
 	struct ssd_sub_tree *subtree;
 	struct ssd_state_title_width *dstate;
-	struct wlr_scene_buffer *scene_buffer;
 	FOR_EACH_STATE(view, subtree) {
 		parent_part = ssd_get_part(&subtree->parts, LAB_SSD_PART_TITLEBAR);
 		assert(parent_part);
@@ -260,19 +259,11 @@ ssd_update_title(struct view *view)
 			wlr_log(WLR_ERROR, "Failed to create title buffer");
 		}
 
-		scene_buffer = wlr_scene_buffer_from_node(part->node);
-
 		/* (Re)set the buffer */
-		wlr_scene_buffer_set_buffer(scene_buffer,
+		wlr_scene_buffer_set_buffer(
+			wlr_scene_buffer_from_node(part->node),
 			part->buffer ? &part->buffer->base : NULL);
 
-		/* Make sure output scaling works correctly */
-		if (part->buffer) {
-			struct wlr_fbox source_box = {0, 0,
-				part->buffer->base.width, part->buffer->base.height };
-			wlr_scene_buffer_set_source_box(scene_buffer, &source_box);
-		}
-
 		/* And finally update the cache */
 		dstate->width = part->buffer ? part->buffer->base.width : 0;
 		dstate->truncated = rect->width <= dstate->width;
diff --git a/subprojects/wlroots.wrap b/subprojects/wlroots.wrap
index d009f9c5..257db737 100644
--- a/subprojects/wlroots.wrap
+++ b/subprojects/wlroots.wrap
@@ -1,6 +1,6 @@
 [wrap-git]
 url = https://gitlab.freedesktop.org/wlroots/wlroots.git
-revision = bb2946f7377b9e71c15457e93f6f9a34712b77de
+revision = 98c5f58a388926c3db5d5b4b9275645bccd54271
 
 [provide]
 dependency_names = wlroots