The lastest and greatest build seems to not work.  Patching only my change instead.