Another attempt at fixing classloader issues.