[SUITEDEV-2114] canonicalization header order

This reverts commit bb08d117c69b2a200d5170bdbec25a2a9a9bf04e.