Revert "PIE: Improve assistant handling"

This reverts commit 0a15f0b8049134734259f6e0d9dc0aad11ed8798.