Committed the wrong version. Replacing with Scanner based impl.