I'm torn here. I'm tempted to suggest that we just nuke the global strategy on master and move on. At this point we are already forked and unable to upgrade because of the jvm-dep-check product/memory issues