Re-enable legacy collectors

The removal doesn't quite work yet and therefore prevents puppet going
out.
Merge pull request #457 from alphagov/reenable-legacy-collectors

Re-enable legacy collectors