Call info 1047353 rebased

This and its associated changes will bitrot bug 1035763.