Remove load order fix, as it breaks too many other things.