rearrange patches

see commit msg