Update native. May help with #5835 and #5840.