Revert "Return listenbuffer behavior" Upstream-commit: 34228586530fb3c51c4faa8ec73b9e15926893ea Component: engine