Backed out changeset 45c336307136 (bug 910845) for bustage.