Fix e013e369 mismerge which is causes i386 LINT fails to build.
This is a direct commit to the stable/13.