Merge "Revert "Change getline to not count the null terminator""