Revert "PIE: Improve assistant handling" to fix google search fc