Add different approach that still allows one-off choices - might need to undeprecate the config entity trust data methods though
Closes #3347842