Revert "Merge pull request #515 from msabramo/pinpoint_unexpected_end_of_key_value_pairs_error"

This reverts commit 0e5decc8ef42a324aaaa17c7e922e60839ade3ec, reversing
changes made to f067ed44b726b754d23f97fd1277a23292382f82.