revert clean-up #2727

Job	Run time
build	6m 45s
test_when_cache_missing	0s
test_when_cache_present (0, 11, 679)	30m 59s
test_when_cache_present (1, 11, 679)	30m 30s
test_when_cache_present (2, 11, 679)	29m 27s
test_when_cache_present (3, 11, 679)	30m 27s
test_when_cache_present (4, 11, 679)	30m 37s
test_when_cache_present (5, 11, 679)	40m 36s
test_when_cache_present (6, 11, 679)	28m 50s
test_when_cache_present (7, 11, 679)	29m 12s
test_when_cache_present (8, 11, 679)	42m 50s
test_when_cache_present (9, 11, 679)	36m 50s
test_when_cache_present (10, 11, 679)	33m 15s
test_when_cache_present (11, 11, 679)	23m 46s
save_test_times_when_cache_missing	0s
save_test_times_when_cache_present	7s
	6h 34m 11s

Provide feedback