Revert header swaps because it's not prettier