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

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