DB/Update: Plan B

By @untaught fixes #10787