Revert "trying to fix up the unicorn restart problem"

This reverts commit c3c3a12d8d86bcd9326122d767f4e1bff0a51774.
Revert "trying to fix up the unicorn restart problem"

This reverts commit d16bd781d5fba3b600d0fc3401bbb3faeffa8022.
Revert "trying to fix up the unicorn restart problem"

This reverts commit 5c40ef442c2d176d2df3e9b502cbda9b334a3df7.