CB-6315: Wrapping this so it runs on the UI thread