Revert "PIE: Fix assistant issues"

This reverts commit aaa45fadec07ea33349ea921f795e140fd4a1b45.
Revert "PIE: Improve assistant handling"

This reverts commit 99816bd351632185699e268465cd3d6ef1338705.