(#1658) - alternative version with no refactor of db.destroy()

As discussed in #1802, an alternative version of #1658 that kicks the can on the `db.destroy()` refactor problem, but gets the tests passing with persistent mapreduce.