Revert to previous changes and add missing packages