revert non-essential changes to NullChannel.