Revert "Fix PSM samples"

This reverts commit b5e234121145080254e5d97a1ec9a7e584b1f872.