Revert "Fix getting die a glorious death along with a theft objective"

You can't have non constant values in the switch body.

This reverts commit 1a1103a77b5e02ba52b8d268d9a9b9f1075ed4d5.