Avoid overzealous stubbing

Change-Id: I700bf1bd8b7be5fb1e178920de6a4b8bbc99f6d6