This reverts commit 3662b5e4030c050e6f08b4897db8b63c137029f8. Too much effort to build this for host vs. build system