(#1910) - more fully cancel changes
(#1460) - always cancel changes when db is destroyed