Propose to backport OAK-8599 fix

[Matt Ryan]

Hi,

I propose to backport the bugfix for OAK-8599 to 1.10.  This fix makes the
implementation more in line with the Javadoc and is a low-risk fix.

-MR