This is now fixed in rev#68189.