Backed out changeset 663470a9a54b (bug 885052)