Switch back to a single RWMutex
Switch back to a single mutex to simplify the switch to channels