[STI] Re-order diffs for clarification purposes.