Merge "Revert "Delay initial accept() until server initialized""