We don't need 2 variants of this method.  One is enough.

Change-Id: I001c388669737e9cf1d92f1fbb1e64fb9f4b05c3