Revert "TRQ-2631 - pbs_server crash"

This reverts commit 10dbbe914ae95c578e90efdd6264c4978408fe59.