Backed out changeset 8c77605c9c5a (bug 885158) for bustage.