This is now fixed by rev#104079