This is now fixed in repository rev#66495.