Revert "UPM Epassafe"

This reverts commit efa389c96c2646ca69b2d48a81381abad7c5dea6.