Backed out changeset 5a28afa66e38 (bug 1051633) for bustage.