Intent to backport to 1.6/1.4/1.2/1.0: OAK-5667

[Julian Reschke]

https://issues.apache.org/jira/browse/OAK-5667

(dead code)