Auto-delete shovels
Merge bug25894