Revert "UCPI"

This reverts commit 0bae382a1693dce7db7a0af661566d6771a24f8f.