Merge "Revert "Make NDC not block forever and handle restart.""