Work around unhelpful MSVC error C2216: override cannot be used with inline

Change-Id: I2944b9911b2458bf1c0f1645fd983b635be67bd2