Fix a scoping problem

Partially revert a2b7ea137af56b6ba4a75c1758ead716504a7614, which
turned out to be too optimistic. (Unfortunately, we touch
this class from H, so it needs to be global, for now.)