Revert "change back to cm trees for the p31xx"

This reverts commit fbde7712e52fc77f36c2b34cd056695e066ebbbe.