Revert the change to GoogleManager: need separate PR