Upgrade / Rebuilds Fail due to MaxMind DB EOL

Revising this … this was backported to stable.