Backed out changeset d923b362bf50 (bug 885979)