rearrange manifest to play nicely with upstream