Follow our own vigor

Change-Id: Iefc2c9ba2f35863591d3b8767b23270113f2b655