This got lost in a refactoring but is actually needed on some systems