am 93241de7: Merge "Remove a bitrotted test." automerge: ba6982a
automerge: 9962ed5

* commit '9962ed55759336642cfaba27e8b2a47822f562fe':
  Remove a bitrotted test.