Merge nico patch

Is this still true btw? We seem to use it and it seems to work, which is why I removed this comment.