am f482fa84: am d7a9f708: Merge "Hmm, contrary to Deckard\'s assurances, this broke internally. Reverting."

* commit 'f482fa848055925d8abe4a8a7f4801bc6c8fc291':
  Hmm, contrary to Deckard's assurances, this broke internally. Reverting.