Work on getting PAT + os-server playing well again.

[#61004526]