Backout the input exhaustion change, it loops.  Still looking for
the right way.