Revert "#218 after alive stuff"

This reverts commit 73dd0370fe9bbd797c09d2383d33d4b0ed0a75c5.
#218 after alive stuff