Work on bug 1046706
Reviewed r/2339