backout OS-2043: partial solution to unbounded problem