Resurrect SaneResId in the place where it is still used

Change-Id: I20f751f6b9fdf683566544aed4ca2ad877abc253