Revert "PIE: Fix assistant issues"

This reverts commit 5ba3a5d3bbdbe420b1c2ecb8d81f445bd7e9fe06.
Revert "Revert "Revert "PIE: Improve assistant handling"""

This reverts commit 256cfced8710bf1897d77e73d9eff46a34150aa9.