The World Cup should never have gone to Qatar in the first place. Football as a sport isn't owned by one particular country (despite what we english think!) but having some sort of stadium infrastructure in place prior to the start of the tournament should be a non-negotiable.

This needn't be limited to richer nations. True, you could host a 48-team World Cup in the UK tomorrow without needing to build anything but at the same time a country like Morocco or Argentina would invest the money spent on renovating their existing infrastructure rather than building it all from scratch.