CLC-2289 Second followup: Be more discriminating in what we delete
Merge pull request #1420 from ctweney/clc-2289-followup

CLC-2289 Second followup: Be more discriminating in what we delete