Patch from https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=179721 broke some application (xterm, pidign)

Hello. 

After updating my system to 11.0-ALPHA2 #20 r301583 
I'm found that at last some application is broken.

here backtrace for xterm 

#0  0x00000008022d48b4 in mbsrtowcs_l () from /lib/libc.so.7
[New Thread 804816000 (LWP 102346/<unknown>)]
(gdb) bt
#0  0x00000008022d48b4 in mbsrtowcs_l () from /lib/libc.so.7
#1  0x00000008022d1b4f in strcoll_l () from /lib/libc.so.7
#2  0x00000008022d0ddf in __collate_range_cmp () from /lib/libc.so.7
#3  0x00000008022cf6ce in vfscanf () from /lib/libc.so.7
#4  0x00000008022b0114 in vsscanf () from /lib/libc.so.7
#5  0x00000008022aee6d in sscanf () from /lib/libc.so.7
#6  0x00000000004523a3 in ?? ()
#7  0x0000000000430edd in ?? ()

for pidgin it's look same.

It seems that patch not fully care about all cases where function like __collate_range_cmp used. 

Manualy rollback changes from http://svnweb.freebsd.org/base?view=revision&revision=301461  fix the problem for now.