Backed out changeset 3d8a39b9c13e (bug 976037) for media test failures