Upstream remap_fields() is fine, since we use get_fields afterwards