rearrange code a bit to fix multiarch stubs#4

ericvh wants to merge 1 commit intou-root:multiarchu-root/sourcery:multiarchfrom

ericvh:multiarchericvh/sourcery:multiarchCopy head branch name to clipboard