FIX: Broken DB issue following a reverted migration (PR #13426)

GitHub