Revert "Package updates"

This reverts commit 8cf34861af96d3c3356de1335dd8d93b0ecf3176.
reverted updates