fix clean shutdown detection
back out of changes to the message store