Merge "Revert to fix build breakage."