Turn out we need all of Bartik for now.