This is completely fixed in rev#79786.