change the ordering for now, I'll alter vserver patch later