Remove unneeded layer of abstraction.
Remove unneeded layer of abstraction.

NeilFraser/CodeCity,NeilFraser/CodeCity,google/CodeCity,google/CodeCity,NeilFraser/CodeCity,NeilFraser/CodeCity,google/CodeCity,google/CodeCity