Fix for #9204.