Get rid of not-quite-singleton - potential issue around reboot