In the mean time, I will be hunting down the other places that we manually populate sources 🙂 I see many deprecations in my future