Don't ask, I won't tell

Change-Id: I3007d50bb685d5b9e476148ac017eb20ac27620a