Update to avoid constructing deprecated list in writer. (reverted from commit f3badb0fe73b6471212c99ccf942e12c5c516981)