Revert "Derp"

This reverts commit c347047d5c512436d894a80ac67d3e9a3c645598.
Revert "PIE: Fix assistant issues"

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

This reverts commit 0a0a1c4c3fdb0dd76b232982d7ee01154160638b.
Leggo