Revert Googlev3 as the new method doesn't work with Eden