Restore various packages to "main-distribution".

These packages were removed as part of the splitting process, but
not because of a decision to remove them from the distribution.