This is now fixed in rev#78028.