Subject: Fixed on core-updates

From: Jakub Kądziołka <[email-masked]>
Date: Fri, 7 Feb 2020 20:10:15 +0100

A patch that fixes this landed on core-updates, see #38873. A follow-up
bug regarding some cleanup is #39415.