rearrange so that backport to 7u will be easy