Backed out changeset e87724022bc1 (bug 1043558) a=ryanvm (feature bustage)