Intent to backport to 1.6: OAK-5641

[Julian Reschke]

...change was already applied to 1.4, so we really ought to have it in 
1.6 as well.