Re-work color channel order to match JP.