Revert "Temporary fix for hybrid pkg installation"