Debugging instability introduced by #317 (#323) #456

Job	Run time
diagnostic_aggregator on humble	3m 47s
diagnostic_aggregator on iron	3m 57s
diagnostic_aggregator on rolling	3m 49s
diagnostic_common_diagnostics on humble	3m 12s
diagnostic_common_diagnostics on iron	3m 23s
diagnostic_common_diagnostics on rolling	3m 10s
diagnostic_updater on humble	3m 32s
diagnostic_updater on iron	4m 18s
diagnostic_updater on rolling	3m 27s
self_test on humble	3m 28s
self_test on iron	3m 55s
self_test on rolling	4m 28s
	44m 26s

Provide feedback