Revert "s3: Fix starving the echo responder"