Revert "Cover more cases in nterp." am: 62d33f7890

Change-Id: I02736a0cc212c837dc5cb39599bf71324595e49c