#811202 sbuild: order some code differently