b35e03b6b1
This reverts commit 2b1392af2f.
This seems to create issues shutting down, so I need to look into it
further.