Fix XE16 voice trigger (again)

Reverts last 3 commits