Revert "Improve pac for exceptions"

This reverts commit 21c8cfe2eac7821184d0d03c2fa50734a3e8379f.