Revert "Revert "Testing out restart=always""

This reverts commit 1021adad520d04e8ebe481d7a0107be687fb77a9.