Upstream merge
Remove the null world/locations patches

These isn't help catch the plugin causing the issues and actually broke some plugins in the process