Revert "PT-41548187 - Fix core dump found during testing"

This reverts commit 88e1a3902af26a4ee1b6c802dd4beaadb491c17a.