Backed out changeset 6436bb6e2070 (bug 844248) for bustage. a=backout