8216375: Revert JDK-8145579 after JDK-8076988 is resolved Remove obsolete code Reviewed-by: thartmann, dlong