Remove the flow control code for now till we figure out the problem.