Revert "Testing out restart=always"

This reverts commit dca4d1686f6e7d402c9c4e7f02ebed57adbdfb5b.