Issue #3123376 by swatichouhan012, johndevman, longwave, xjm: update_fix_incompatibility() is (theoretically) dead code, but is also theoretically dangerous (cherry picked from commit 668f597c)