Auto-delete shovels
Merge bug 25894