Backout Bug 964200  part 3c