This makes it a little more flexible in edge cases where
the messages have already been unset in the cookie storage
(e.g. the request-response cycle is complete).

Change-Id: I9f3b1ec3f908d05c523ce013ab5fbd73837aff55