Backed out changeset 761071f57ab6 (bug 1024809) for emulator ics bustage