Backed out changeset 9f4b2ff029e3 (bug 918386) for breaking emulator tests on a CLOSED TREE