landed bug 851231. new patch for bug 862024