Can we remove this hack now that the backend is returning the right data?