Undo 72cc434 - it halts server connection