Revert 25b95ff..429d08c

This rolls back to commit 25b95ff172c46ffbf08b6d36654aec82c7318cf9.
update XPI