Revert Channel locking change, needs testing on stage