More flexible way for message about revert to snapshot

Change-Id: I9f46e8410c97215fb727fe3051073227a97bee4b