Restore previous struct iteration behavior.