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