UF nonblock_dbg patch

Note that the hunk beginning at line 85 failed due to a previous
commit from Ken Nielson in the 4.2-dev branch.  That hunk was
removed from the patch.