Merged in changes to address [f798e2ea12].

The code to manipulate the channel options may not be needed at all, we will review it to see if there are any issues with removing it altogether