Follow-up r72870: fixed patch file so that it actually works, switched it to native...