"minor: 2.6 compatibility cross referencing"

This reverts/modifies commit 11156f83a707847f093a4ff85eecb0c1445e8dd8.