gonna get hard to reconcile changes from Perforce puppet, if anything were ever to come from there. I guess that ship has sailed though.