diff -up banshee-2.6.2/src/Clients/Beroe/Beroe/IndexerClient.cs.dbus2 banshee-2.6.2/src/Clients/Beroe/Beroe/IndexerClient.cs
--- banshee-2.6.2/src/Clients/Beroe/Beroe/IndexerClient.cs.dbus2	2017-07-18 12:03:47.804334294 -0400
+++ banshee-2.6.2/src/Clients/Beroe/Beroe/IndexerClient.cs	2017-07-18 12:03:59.875023236 -0400
@@ -43,7 +43,6 @@ using Banshee.Collection.Indexer;
 
 namespace Beroe
 {
-    [DBusExportable (ServiceName = "CollectionIndexer")]
     public class IndexerClient : Client, IIndexerClient, IDBusExportable
     {
         public static void Main ()
diff -up banshee-2.6.2/src/Core/Banshee.Services/Banshee.Collection.Indexer/CollectionIndexer.cs.dbus2 banshee-2.6.2/src/Core/Banshee.Services/Banshee.Collection.Indexer/CollectionIndexer.cs
--- banshee-2.6.2/src/Core/Banshee.Services/Banshee.Collection.Indexer/CollectionIndexer.cs.dbus2	2017-07-18 12:04:12.220705091 -0400
+++ banshee-2.6.2/src/Core/Banshee.Services/Banshee.Collection.Indexer/CollectionIndexer.cs	2017-07-18 12:04:24.912378030 -0400
@@ -42,7 +42,6 @@ using Banshee.Collection.Database;
 
 namespace Banshee.Collection.Indexer
 {
-    [DBusExportable (ServiceName = "CollectionIndexer")]
     public class CollectionIndexer : ICollectionIndexer, IService, IDBusExportable, IDisposable
     {
         private static int instance_count = 0;
diff -up banshee-2.6.2/src/Core/Banshee.Services/Banshee.Collection.Indexer/CollectionIndexerService.cs.dbus2 banshee-2.6.2/src/Core/Banshee.Services/Banshee.Collection.Indexer/CollectionIndexerService.cs
--- banshee-2.6.2/src/Core/Banshee.Services/Banshee.Collection.Indexer/CollectionIndexerService.cs.dbus2	2017-07-18 12:04:40.802968534 -0400
+++ banshee-2.6.2/src/Core/Banshee.Services/Banshee.Collection.Indexer/CollectionIndexerService.cs	2017-07-18 12:04:50.458719709 -0400
@@ -41,7 +41,6 @@ using Banshee.Collection.Database;
 
 namespace Banshee.Collection.Indexer
 {
-    [DBusExportable (ServiceName = "CollectionIndexer")]
     public class CollectionIndexerService : ICollectionIndexerService, IDBusExportable, IDisposable
     {
         private List<LibrarySource> libraries = new List<LibrarySource> ();
diff -up banshee-2.6.2/src/Core/Banshee.Services/Banshee.ServiceStack/DBusServiceManager.cs.dbus2 banshee-2.6.2/src/Core/Banshee.Services/Banshee.ServiceStack/DBusServiceManager.cs
--- banshee-2.6.2/src/Core/Banshee.Services/Banshee.ServiceStack/DBusServiceManager.cs.dbus2	2014-02-18 15:35:23.000000000 -0500
+++ banshee-2.6.2/src/Core/Banshee.Services/Banshee.ServiceStack/DBusServiceManager.cs	2017-07-18 12:07:03.823282943 -0400
@@ -40,15 +40,6 @@ using Banshee.Base;
 
 namespace Banshee.ServiceStack
 {
-    public class DBusExportableAttribute : Attribute
-    {
-        private string service_name;
-        public string ServiceName {
-            get { return service_name; }
-            set { service_name = value; }
-        }
-    }
-
     public class DBusServiceManager : IService
     {
         public const string ObjectRoot = "/org/bansheeproject/Banshee";
@@ -102,43 +93,21 @@ namespace Banshee.ServiceStack
 
         public ObjectPath RegisterObject (IDBusExportable o)
         {
-            return RegisterObject (DBusConnection.DefaultServiceName, o);
-        }
-
-        public ObjectPath RegisterObject (string serviceName, IDBusExportable o)
-        {
-            return RegisterObject (serviceName, o, MakeObjectPath (o));
+            return RegisterObject (o, MakeObjectPath (o));
         }
 
         public ObjectPath RegisterObject (object o, string objectName)
         {
-            return RegisterObject (DBusConnection.DefaultServiceName, o, objectName);
-        }
-
-        public ObjectPath RegisterObject (string serviceName, object o, string objectName)
-        {
             ObjectPath path = null;
 
             if (DBusConnection.Enabled && Bus.Session != null) {
-                object [] attrs = o.GetType ().GetCustomAttributes (typeof (DBusExportableAttribute), true);
-                if (attrs != null && attrs.Length > 0) {
-                    DBusExportableAttribute dbus_attr = (DBusExportableAttribute)attrs[0];
-                    if (!String.IsNullOrEmpty (dbus_attr.ServiceName)) {
-                        serviceName = dbus_attr.ServiceName;
-                    }
-                }
-
                 lock (registered_objects) {
                     registered_objects.Add (o, path = new ObjectPath (objectName));
                 }
 
-                string bus_name = DBusConnection.MakeBusName (serviceName);
-
-                Log.DebugFormat ("Registering remote object {0} ({1}) on {2}", path, o.GetType (), bus_name);
+                Log.DebugFormat ("Registering remote object {0} ({1})", path, o.GetType ());
 
-                #pragma warning disable 0618
-                Bus.Session.Register (bus_name, path, o);
-                #pragma warning restore 0618
+                Bus.Session.Register (path, o);
             }
 
             return path;