Let's make a second method in CatalogUtil that might call the same mess underneath but at least has a name and comment that maybe describes how we got into this sadness (instead of just adding an unhelpfully-named boolean to the existing method).  You'll end up having to call here with the stupid flag, but the calling sites will hopefully be less confusing?