Revert "TRQ-2631 - pbs_server crash"

This reverts commit a23f20a1a426c9820245ce19cb801a731b34b0cd.