Issue #2345607 followup by webflo: The combination of #2345607 and #2344821 shortly after broke head.