Revert "Gen 3: Fix residual order"

This reverts commit f0d33f64730fbd194a04ea4c662ebe5c964e9338.