Backed out changeset dc6994acf4e3 (bug 1109457) for EME test failures and crashes.
CLOSED TREE