This reverts commit 90613056cef95fe32d19198d88a0d71f00c5f6ae, or the part that removed a goroutine at least. Reverting because this has caused an infinite wait for push/pull on windows. We'll need to find out why that happens separately