Restore the Nx macro lost in transit. This matches upstream. PR: 186205 Submitted by: naddy MFC after: 3 days