Revert iterator conventions to RFC status