Reverts listen / stop removal.

Breaks critical code.