Swap old messaging scheme figure to new.