The fix for FS-3577 causes instabilities if multiple listeners are connected it seems. Undoing this change for now until I can figure out the root cause.