JDK-8157190 has been fixed in 8u302. Once CI has upgraded we should revert the workaround added in #26252.