revert package config. Make a PR simpler and more compatible