Moving it will require a bunch of qa and testing that's out of scope of this branch imho. It should go in the `if charmbrowser` block below. As atm it's being run even for sections other than A