Re #8355. Adding some of the deletes back.