This issue is now fixed by rev#68822.