EPD-41: Work on real restart. Tested on Mac for now