do what I mean, not what I say

Change-Id: I1c86ff5713401771d6002de0a26bad4430d271fd