Review Request 125: Make restart() work