Revert "Merge some packages"

This reverts commit de3c136affa9919dfe9cba1e4ad51c97c5285cec.
Merge some packages