Cope if the shovel is not there.
Merge bug26453
stable to default