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