revert ham-handed nclist case insensitivity patch in favor of a bit more subtlety