work on bug 808370. landed bug 829913.