Merge "Revert "Revert "Remove overlay logic from package manager and parser"""