See 6b98b274b6 for an explanation of the problem and solution. Here I've applied the solution to channels. (cherry picked from commit 8b209fd4f8, AKA gh-121805) Co-authored-by: Eric Snow <ericsnowcurrently@gmail.com>
6b98b274b6
8b209fd4f8