Noting #1090
Exposing this to use it from other places that use channels