Issue #2331677 by othermachines: Updates 7025 and 7027 attempted to update the wrong tables.