RFR: 8285507: revert fix for JDK-8282704 now that JDK-8282952 is fixed [v2]

[Daniel D.Daugherty]

On Mon, 2 May 2022 15:18:37 GMT, Patricio Chilano Mateo <pchilanomate at openjdk.org> wrote:

>> Daniel D. Daugherty has updated the pull request with a new target base due to a merge or a rebase. The pull request now contains two commits:
>> 
>>  - Merge branch 'JDK-8284632' into JDK-8285507
>>  - 8285507.cr0
>
> Looks good!
> 
> Thanks,
> Patricio

@pchilano - Thanks for the review!

-------------

PR: https://git.openjdk.java.net/jdk/pull/8389