This reverts commit 8d53997685, reversing changes made to 4f548e835c. This is crashing on shutdown.
8d53997685
4f548e835c