Move the death handler over to the new file system.