Move back to using bufio