Patch up remaining issues with revert.

Change-Id: I18389962e83ab43930b46dbb1e7b8263e096e86e
1 file changed