Merge pull request #2658 from wpaulino/bogus-channel-reestablish