diff --git a/data/gnome-session-x11.target b/data/gnome-session-x11.target
deleted file mode 100644
index e13cc9eec645cb42a666461fd302bc52348a8aca..0000000000000000000000000000000000000000
--- a/data/gnome-session-x11.target
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=GNOME X11 Session
-# On X11, try to show the fail screen
-OnFailure=gnome-session-failed.target
-OnFailureJobMode=replace
-# Avoid default After/Before rules
-DefaultDependencies=no
-
-Before=gnome-session.target
-
-PartOf=graphical-session.target
-RefuseManualStart=yes
-RefuseManualStop=yes
-
-# Pull in all X11-specific services the session might depend on
-Requires=gnome-session-x11-services.target
diff --git a/data/gnome-session-x11@.target b/data/gnome-session-x11@.target
deleted file mode 100644
index ce5879b2078eb38b486c62ee7ee28965884cb456..0000000000000000000000000000000000000000
--- a/data/gnome-session-x11@.target
+++ /dev/null
@@ -1,22 +0,0 @@
-[Unit]
-Description=GNOME X11 Session (session: %i)
-OnFailure=gnome-session-failed.target
-OnFailureJobMode=replace
-DefaultDependencies=no
-# Start happens explicitly
-RefuseManualStart=no
-# Stop happens by starting gnome-session-shutdown.target
-#RefuseManualStop=yes
-
-Conflicts=shutdown.target gnome-session-shutdown.target
-PartOf=graphical-session.target
-
-# As this is the main entry point, pull in the other toplevel gnome-session targets
-BindsTo=gnome-session@.target
-After=gnome-session@.target
-
-BindsTo=gnome-session-x11.target
-After=gnome-session-x11.target
-
-BindsTo=gnome-session.target
-After=gnome-session.target
diff --git a/data/gnome-wayland.desktop.in.in b/data/gnome-wayland.desktop.in.in
deleted file mode 100644
index b48eecd6bdec330e6986778138b762960efcb2f2..0000000000000000000000000000000000000000
--- a/data/gnome-wayland.desktop.in.in
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=GNOME on Wayland
-Comment=This session logs you into GNOME
-Exec=@bindir@/gnome-session
-TryExec=@bindir@/gnome-session
-Type=Application
-DesktopNames=GNOME
-X-GDM-SessionRegisters=true
diff --git a/data/gnome-xorg.desktop.in.in b/data/gnome-xorg.desktop.in.in
deleted file mode 100644
index 9a76fac874b03d3326986a8df2a4d4103c7d348c..0000000000000000000000000000000000000000
--- a/data/gnome-xorg.desktop.in.in
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=GNOME on Xorg
-Comment=This session logs you into GNOME
-Exec=@bindir@/gnome-session
-TryExec=@bindir@/gnome-session
-Type=Application
-DesktopNames=GNOME
-X-GDM-SessionRegisters=true
diff --git a/data/meson.build b/data/meson.build
index 006000e924f6c75398e4a1b1029fc6a6b0eb7102..007c399d6e7beb0b09e350dafd58e8f984705818 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -2,8 +2,6 @@ desktop_plain = 'gnome'
 
 desktops = [
   desktop_plain,
-  'gnome-xorg',
-  'gnome-wayland',
 ]
 
 shell_component = {
@@ -47,20 +45,10 @@ foreach name: desktops
     configuration: desktop_conf
   )
 
-  if name.endswith('-xorg')
+  if name == 'gnome-custom-session'
     install_dir = session_datadir / 'xsessions'
-  elif name.endswith('-wayland')
-    install_dir = session_datadir / 'wayland-sessions'
   else
-    # FIXME: The same target can not be copied into two directories.
-    #        There is a workaround in meson_post_install.py until proper
-    #        solution arises:
-    #        https://github.com/mesonbuild/meson/issues/2416
-    install_dir = session_datadir / 'xsessions'
-    #install_dir = [
-    #  join_paths(session_datadir, 'xsessions'),
-    #  join_paths(session_datadir, 'wayland-sessions')
-    #]
+    install_dir = session_datadir / 'wayland-sessions'
   endif
 
   desktop_target = i18n.merge_file(
diff --git a/meson_post_install.py b/meson_post_install.py
index 27017f65147c5d81ce99038aeb2bb9b50558196a..78c01f99020c53481439dad9cf8f73eaea6082e9 100644
--- a/meson_post_install.py
+++ b/meson_post_install.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python3
 
 import os
-import shutil
 import subprocess
 import sys
 
@@ -20,7 +19,3 @@ if not os.environ.get('DESTDIR'):
 dst_dir = os.path.join(install_root, 'wayland-sessions')
 if not os.path.exists(dst_dir):
   os.makedirs(dst_dir)
-
-src = os.path.join(install_root, 'xsessions', 'gnome.desktop')
-dst = os.path.join(dst_dir, 'gnome.desktop')
-shutil.copyfile(src, dst)