No need to patch out nls anymore