Update native with another attempt at fixing #4272