This got lost in a refactoring but is actually needed on some systems
mentioned in merge request !386 (merged)