am 80a30431: (-s ours) Remove some pointless tests.

* commit '80a30431fa6c92433d2602c159bc71dd81c62c8f':
  Remove some pointless tests.