Revert use of fetch all as not supported in all versions