Long term solution. Select/build native replacements for the next ROM release.