Prevent confusion between channel and target.
Do not rely on any commit history of this branch because I messed up loads of it.