Get rid of noifniof
Merge pull request #3094 from alfredxing/no-noifniof