Backout of changes inadverently checked in with previous commit for bug 910899