Revert "TRQ-2631 - pbs_server crash"

This reverts commit 28675b86712637f3297c12cd92f26f55a544e9d2.