Better naming of get_cobrand_body_handler (TO REBASE)
Tidy up $revert logic (TO REBASE)