Revert 731d91c..0a42d91

This rolls back to commit 731d91c4a52b67356d949af10cbc4bc801ab7464.
Long parsing fixed
return values
long