Tweaking ClassLoader for 5.2 again