Revert use of fetch all as not supported in all versions
Merge pull request #360 from timschofield/develop

Revert use of fetch all as not supported in all versions