Backed out changeset 9c204e0c1af1 (bug 867485) for bustage.