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