Removed the istream lock-in