=rem #3555: Wrong and superfluous match in EndpointWriter
(cherry picked from commit 89a3454)
Merge pull request #1656 from drewhk/wip-3555-backport-drewhk

=rem #3555: Wrong and superfluous match in EndpointWriter (backport)