Fix Bug 1037584 - Changes from #890556 breaks player unit test