Revert "adjusting workaround to skip '\0' in crooked inputs"

This reverts commit 1673f46bde0562d7b77151e65a09cd280d9a522d.
Revert "adding workaround to handle unexpected '\0' characters in the input."

This reverts commit fa4956abac02798c9344c6d9917be468c9a1f249.
Merge remote-tracking branch 'origin/master' into develop