This is for PR 36352. Alternatively, maybe this could have been done in the package that needed it instead.
52f17df66c