Re-add standard-with-extra-repos