fix-ish for restart failures

This is the same thing we tried out on the servers.