Revert "Revert "Tweak order of tags (again).""

This reverts commit 62e00b57c8c919b554d07e0a73e27939f9aca187.

This was not supposed to be committed.
CHANGES