Merge "Revert "Disabled test that does not run on CI server or workstation.""