diff -Nru syncthing-1.12.1~ds1/debian/changelog syncthing-1.12.1~ds1/debian/changelog
--- syncthing-1.12.1~ds1/debian/changelog	2021-07-23 16:27:51.000000000 -0400
+++ syncthing-1.12.1~ds1/debian/changelog	2021-07-15 11:47:47.000000000 -0400
@@ -1,20 +1,6 @@
-syncthing (1.12.1~ds1-4) unstable; urgency=medium
-
-  [ Alexandre Viau ]
-  * Import patches.
-
-  [ Simone Rossetto ]
-  * Fix cannot set more than one option in STDISCOSRV_OPTS
-    (Closes: #985938).
-
-  [ Simon Frei ]
-  * Fix inconsistent state after accepting new folder (Closes: #990330).
-
- -- Alexandre Viau <aviau@debian.org>  Fri, 23 Jul 2021 16:27:51 -0400
-
 syncthing (1.12.1~ds1-3) unstable; urgency=medium
 
-  [ Alexandre Viau ]
+  [ Alexandre Viau]
   * Refresh patches.
 
   [ Simon Frei ]
diff -Nru syncthing-1.12.1~ds1/debian/patches/empty-cfg.patch syncthing-1.12.1~ds1/debian/patches/empty-cfg.patch
--- syncthing-1.12.1~ds1/debian/patches/empty-cfg.patch	2021-07-23 16:27:51.000000000 -0400
+++ syncthing-1.12.1~ds1/debian/patches/empty-cfg.patch	1969-12-31 19:00:00.000000000 -0500
@@ -1,54 +0,0 @@
-Origin: vendor
-Bug: https://bugs.debian.org/990330
-
---- a/lib/model/indexsender.go
-+++ b/lib/model/indexsender.go
-@@ -332,15 +332,15 @@
- // addPending stores the given info to start an index sender once resume is called
- // for this folder.
- // If an index sender is already running, it will be stopped.
--func (r *indexSenderRegistry) addPending(folder config.FolderConfiguration, startInfo *indexSenderStartInfo) {
-+func (r *indexSenderRegistry) addPending(folderID string, startInfo *indexSenderStartInfo) {
- 	r.mut.Lock()
- 	defer r.mut.Unlock()
- 
--	if is, ok := r.indexSenders[folder.ID]; ok {
-+	if is, ok := r.indexSenders[folderID]; ok {
- 		r.sup.RemoveAndWait(is.token, 0)
--		delete(r.indexSenders, folder.ID)
-+		delete(r.indexSenders, folderID)
- 	}
--	r.startInfos[folder.ID] = startInfo
-+	r.startInfos[folderID] = startInfo
- }
- 
- // remove stops a running index sender or removes one pending to be started.
---- a/lib/model/model.go
-+++ b/lib/model/model.go
-@@ -1252,7 +1252,7 @@
- 				continue
- 			}
- 			m.cfg.AddOrUpdatePendingFolder(folder.ID, folder.Label, deviceID)
--			indexSenders.addPending(cfg, ccDeviceInfos[folder.ID])
-+			indexSenders.addPending(folder.ID, ccDeviceInfos[folder.ID])
- 			changed = true
- 			m.evLogger.Log(events.FolderRejected, map[string]string{
- 				"folder":      folder.ID,
-@@ -1270,7 +1270,7 @@
- 		}
- 
- 		if cfg.Paused {
--			indexSenders.addPending(cfg, ccDeviceInfos[folder.ID])
-+			indexSenders.addPending(cfg.ID, ccDeviceInfos[folder.ID])
- 			continue
- 		}
- 
-@@ -1312,7 +1312,7 @@
- 			// Shouldn't happen because !cfg.Paused, but might happen
- 			// if the folder is about to be unpaused, but not yet.
- 			l.Debugln("ccH: no fset", folder.ID)
--			indexSenders.addPending(cfg, ccDeviceInfos[folder.ID])
-+			indexSenders.addPending(cfg.ID, ccDeviceInfos[folder.ID])
- 			continue
- 		}
- 
diff -Nru syncthing-1.12.1~ds1/debian/patches/series syncthing-1.12.1~ds1/debian/patches/series
--- syncthing-1.12.1~ds1/debian/patches/series	2021-07-23 16:27:51.000000000 -0400
+++ syncthing-1.12.1~ds1/debian/patches/series	2021-07-15 11:47:47.000000000 -0400
@@ -11,4 +11,3 @@
 0003-lib-model-Handle-index-sender-terminating-due-to-err.patch
 0001-lib-db-Prevent-IndexID-creation-race-7211.patch
 0002-lib-Close-underlying-conn-in-protocol-fixes-7165-721.patch
-empty-cfg.patch
diff -Nru syncthing-1.12.1~ds1/debian/syncthing-discosrv.service syncthing-1.12.1~ds1/debian/syncthing-discosrv.service
--- syncthing-1.12.1~ds1/debian/syncthing-discosrv.service	2021-07-23 16:27:51.000000000 -0400
+++ syncthing-1.12.1~ds1/debian/syncthing-discosrv.service	2021-07-15 11:47:47.000000000 -0400
@@ -8,7 +8,7 @@
 Group=syncthing
 WorkingDirectory=/var/lib/syncthing/discosrv
 EnvironmentFile=-/etc/default/syncthing-discosrv
-ExecStart=/usr/bin/stdiscosrv $STDISCOSRV_OPTS
+ExecStart=/usr/bin/stdiscosrv ${STDISCOSRV_OPTS}
 Restart=on-failure
 
 [Install]