Rearrange face definitions to be in the same order as