Add a temporary restart hack

/cc @HubbeKing