Revert "Makes virt_type based package selection nicer"

This reverts commit ae327ef9e65c836d11f7d4ace3ecf377beb1aa0c.
Make services compatible with ubuntu