Revert 2c30112099 for support pkgs.

At least until I get the dependencies sorted properly.