Revert "Fix native-xtools build"
This reverts commit 36269b82318280ef184c953b90674f5905e0f53f.
This had an unintended change included.