Yet another rebuild. this time for better cross compatibility.