Can we just remove this and fix up the (few) consumers in trunk?