Revert "Backport some obvious fixes for the core from Bacula 7."

This reverts commit e2f8f223d0a83feeb2c74eacc05564128b68abe9.