Re-enable legacy collectors

The removal doesn't quite work yet and therefore prevents puppet going
out.