Previously, the snapshot was only deleted under certain unlikely circumstances.  This should fix it (unverified).
Previously, the snapshot was only deleted under certain unlikely
circumstances.  This should fix it (unverified).

jojochuang/eventwave,jojochuang/eventwave,jojochuang/eventwave,jojochuang/eventwave,jojochuang/eventwave