Backed out changeset b31464975bb4 (bug 1845666) for causing media.utility related...