Revert "build: fix the p2 composite files"

This reverts commit 70274a8b9a336052784bdcc6443229cd33fa9ac7.