That's what this does, but the diff is just messy in this PR. Order matters man!