base

DO NOT MERGE Fix build.

Looks like a method that won't compile was left behind as part of
a merge conflict resolution.

Change-Id: I75eabc0c626a619a666642c7c685e4ce544095e7