This reverts commit 3eb623e73b. This change is plain wrong. The correct order was already fixed in commit 42dab8e8.
3eb623e73b
42dab8e8