Part of deprecating https://docs.google.com/document/d/1vP0wgmXNwbDviCrN5HLbSYMpnQU5lELsq9Hdn80bZvc/edit#