I'll nuke the deprecated stuff and move this method out of CatkinPackage to be more like your PR13