c77b3fa258
Fix interface ordering again
Original-merge: 731874429c
Merged-by: Bond-009 <bond.009@outlook.com>
Backported-by: Bond_009 <bond.009@outlook.com>