Backed out changeset 487d71a5923c (bug 1042771) for bustage. DONTBUILD