Unvirtualize a couple of functions

Change-Id: I1df9d7d1f0186a6983e54906c2d1b1684663826d