Revert "The buffering fix in f206e7e obviates replacing input() with a wrapper (which in turn was breaking readline)"

This reverts commit ef206f7a749324b560e7a0c3e61865e0a87e7c05.