This reverts commit 90613056ce, 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
90613056ce