I was unable to locate it again. I just upgraded the whole checkout to fix it
Thanks for reporting back, @mprough. With OPC, it's best not to "cherry-pick" changes as many of the class-related changes also hinge on associated template changes (and vice versa).