Addresses bug #64929.