use our goldfish

Change-Id: I648fddce9e5876616c0c953d5ae48449f81efb44