backout 4fb9e70a38b2 (bug 841350) for causing bug 847070