Partially revert #1074011; don't try to fflush stdin.

Backported to 2.3 and 2.4.