Removed vpnaas because it's now a separate package.