Revert "Activate JDK8 for USC"