am 676e964d: Merge "Remove a test for dead code."

* commit '676e964d0be749b9899511f5f7212c3765c8f38a':
  Remove a test for dead code.