Same as above. These are leftovers from #1008