bdd22b61c2
Reviewed-by: Steve Loughran <stevel@apache.org> (cherry picked from commit 52217fce3d2a553c8850b7a1886340ae5a092436)