Revert "Cope with builds with differing debug options within a second of each"