DLX without confirms
Minimise diff
Further excisions
Merge bug25504