Backed out changeset 92295f515d2d (bug 1091777) for bustage.