patch bug 952708 has landed. work on bug 917227