Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "close leaking BufferedReader""""""""

This reverts commit edf2ce262144caf0e2692306f45aaead7870a559.