Revert "DEATH by blaze"

This reverts commit 35f34a00338839cacd5f50e0fd1e7133e8c1a24a.