Rik call info 1047353

This will bitrot bug 1035763.