Revert "Revert "close leaking BufferedReader""

This reverts commit b714e1c382ccb7e5fd067811c46ebaffe6df253e.